]> 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>
Mon, 2 Aug 2010 16:43:58 +0000 (09:43 -0700)
committerBrion Vibber <brion@pobox.com>
Mon, 2 Aug 2010 16:43:58 +0000 (09:43 -0700)

Trivial merge