]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge commit 'origin/master' into testing
authorBrion Vibber <brion@pobox.com>
Thu, 28 Jan 2010 21:35:09 +0000 (13:35 -0800)
committerBrion Vibber <brion@pobox.com>
Thu, 28 Jan 2010 21:35:09 +0000 (13:35 -0800)

Trivial merge