]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge remote branch 'origin/1.0.x' into 1.0.x
authorEvan Prodromou <evan@status.net>
Tue, 12 Apr 2011 18:33:20 +0000 (14:33 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 12 Apr 2011 18:33:20 +0000 (14:33 -0400)

Trivial merge