]> 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@status.net>
Mon, 4 Jan 2010 18:43:45 +0000 (10:43 -0800)
committerBrion Vibber <brion@status.net>
Mon, 4 Jan 2010 18:43:45 +0000 (10:43 -0800)

Trivial merge