]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge remote branch 'statusnet/testing' into testing
authorJames Walker <walkah@walkah.net>
Fri, 26 Feb 2010 08:27:40 +0000 (03:27 -0500)
committerJames Walker <walkah@walkah.net>
Fri, 26 Feb 2010 08:27:40 +0000 (03:27 -0500)

Trivial merge