summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2009-11-30 13:11:51 -0800
committerZach Copley <zach@status.net>2009-11-30 13:11:51 -0800
commit790fa5975c8fac5d46510ab5057ce7e8573bb25c (patch)
treeab6726ff25a4d617ff1c677d4f1cc8d258e1c02c /scripts
parent2451192415ae93a329b412761cfbb26df8185474 (diff)
parent4f71c7a9c78b2ad82498d0c72d46bfd5573ead50 (diff)
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
* '0.9.x' of gitorious.org:statusnet/mainline: Ticket 1677: apply a couple more welcomebot fixes from TranslateWiki before the next full update
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions