]> 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>
Mon, 7 Mar 2011 20:20:11 +0000 (12:20 -0800)
committerBrion Vibber <brion@pobox.com>
Mon, 7 Mar 2011 20:20:11 +0000 (12:20 -0800)

Trivial merge