]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
authorZach Copley <zach@status.net>
Mon, 30 Nov 2009 21:11:51 +0000 (13:11 -0800)
committerZach Copley <zach@status.net>
Mon, 30 Nov 2009 21:11:51 +0000 (13:11 -0800)
* '0.9.x' of gitorious.org:statusnet/mainline:
  Ticket 1677: apply a couple more welcomebot fixes from TranslateWiki before the next full update


Trivial merge