]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Thu, 6 May 2010 00:07:50 +0000 (17:07 -0700)
committerBrion Vibber <brion@pobox.com>
Thu, 6 May 2010 00:07:50 +0000 (17:07 -0700)
commite05415f621890bbaf42752577249ecdc22c161fc
tree9291f0eb1b6c0a57ffeaa7279d4316ab6041206d
parent94190e77f664c06c76e650fdebd23720fe26bf6e
parentb50f300566143837aba3739d62caf679ec19727e
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