]> 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, 12 Jul 2010 21:21:57 +0000 (14:21 -0700)
committerBrion Vibber <brion@pobox.com>
Mon, 12 Jul 2010 21:21:57 +0000 (14:21 -0700)

Trivial merge