]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of gitorious.org:statusnet/mainline
authorBrion Vibber <brion@pobox.com>
Sat, 16 Jan 2010 21:37:49 +0000 (13:37 -0800)
committerBrion Vibber <brion@pobox.com>
Sat, 16 Jan 2010 21:37:49 +0000 (13:37 -0800)

Trivial merge