]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@status.net>
Fri, 19 Nov 2010 20:00:42 +0000 (12:00 -0800)
committerBrion Vibber <brion@status.net>
Fri, 19 Nov 2010 20:00:42 +0000 (12:00 -0800)

Trivial merge