]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Mon, 13 Dec 2010 22:03:59 +0000 (14:03 -0800)
committerBrion Vibber <brion@pobox.com>
Mon, 13 Dec 2010 22:03:59 +0000 (14:03 -0800)

Trivial merge