]> 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>
Mon, 12 Oct 2009 18:10:06 +0000 (11:10 -0700)
committerBrion Vibber <brion@pobox.com>
Mon, 12 Oct 2009 18:10:06 +0000 (11:10 -0700)

Trivial merge