]> 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>
Fri, 4 Mar 2011 21:41:01 +0000 (13:41 -0800)
committerBrion Vibber <brion@pobox.com>
Fri, 4 Mar 2011 21:41:01 +0000 (13:41 -0800)

Trivial merge