]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
authorBrion Vibber <brion@pobox.com>
Fri, 30 Apr 2010 21:08:35 +0000 (14:08 -0700)
committerBrion Vibber <brion@pobox.com>
Fri, 30 Apr 2010 21:08:35 +0000 (14:08 -0700)

Trivial merge