]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge commit 'origin/master' into testing
authorBrion Vibber <brion@pobox.com>
Tue, 9 Mar 2010 19:27:30 +0000 (11:27 -0800)
committerBrion Vibber <brion@pobox.com>
Tue, 9 Mar 2010 19:27:30 +0000 (11:27 -0800)

Trivial merge