]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of git@gitorious.org:statusnet/mainline
authorBrion Vibber <brion@pobox.com>
Fri, 29 Jan 2010 06:29:26 +0000 (22:29 -0800)
committerBrion Vibber <brion@pobox.com>
Fri, 29 Jan 2010 06:29:26 +0000 (22:29 -0800)

Trivial merge