]> 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, 5 Oct 2009 16:01:51 +0000 (09:01 -0700)
committerBrion Vibber <brion@pobox.com>
Mon, 5 Oct 2009 16:01:51 +0000 (09:01 -0700)

Trivial merge