]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorBrion Vibber <brion@pobox.com>
Wed, 16 Mar 2011 23:12:31 +0000 (16:12 -0700)
committerBrion Vibber <brion@pobox.com>
Wed, 16 Mar 2011 23:12:31 +0000 (16:12 -0700)

Trivial merge