]> 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>
Sun, 4 Oct 2009 23:16:52 +0000 (16:16 -0700)
committerBrion Vibber <brion@pobox.com>
Sun, 4 Oct 2009 23:16:52 +0000 (16:16 -0700)

Trivial merge