]> 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, 28 Oct 2010 00:15:59 +0000 (00:15 +0000)
committerBrion Vibber <brion@pobox.com>
Thu, 28 Oct 2010 00:15:59 +0000 (00:15 +0000)

Trivial merge