]> 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>
Fri, 15 Jan 2010 17:52:50 +0000 (09:52 -0800)
committerBrion Vibber <brion@pobox.com>
Fri, 15 Jan 2010 17:52:50 +0000 (09:52 -0800)

Trivial merge