]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Fri, 19 Mar 2010 17:27:47 +0000 (10:27 -0700)
committerBrion Vibber <brion@pobox.com>
Fri, 19 Mar 2010 17:27:47 +0000 (10:27 -0700)

Trivial merge