]> 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>
Sat, 26 Jun 2010 19:10:47 +0000 (15:10 -0400)
committerBrion Vibber <brion@pobox.com>
Sat, 26 Jun 2010 19:10:47 +0000 (15:10 -0400)

Trivial merge