]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge remote branch 'statusnet/testing' into testing
authorJames Walker <walkah@walkah.net>
Thu, 4 Mar 2010 06:31:19 +0000 (01:31 -0500)
committerJames Walker <walkah@walkah.net>
Thu, 4 Mar 2010 06:31:19 +0000 (01:31 -0500)

Trivial merge