]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Thu, 18 Nov 2010 00:13:40 +0000 (16:13 -0800)
committerBrion Vibber <brion@pobox.com>
Thu, 18 Nov 2010 00:13:40 +0000 (16:13 -0800)

Trivial merge