]> 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, 9 Apr 2010 22:20:14 +0000 (15:20 -0700)
committerBrion Vibber <brion@pobox.com>
Fri, 9 Apr 2010 22:20:14 +0000 (15:20 -0700)

Trivial merge