From: Brion Vibber Date: Thu, 6 May 2010 00:07:50 +0000 (-0700) Subject: Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x X-Git-Url: https://git.mxchange.org/?p=quix0rs-gnu-social.git;a=commitdiff_plain;h=e05415f621890bbaf42752577249ecdc22c161fc Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x Conflicts: locale/ca/LC_MESSAGES/statusnet.po locale/de/LC_MESSAGES/statusnet.po locale/statusnet.pot --- e05415f621890bbaf42752577249ecdc22c161fc