]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
authorBrion Vibber <brion@pobox.com>
Sat, 4 Sep 2010 01:01:08 +0000 (18:01 -0700)
committerBrion Vibber <brion@pobox.com>
Sat, 4 Sep 2010 01:01:08 +0000 (18:01 -0700)

Trivial merge