]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge remote-tracking branch 'origin/1.0.x' into 1.0.x
authorEvan Prodromou <evan@status.net>
Mon, 18 Jul 2011 14:45:15 +0000 (10:45 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 18 Jul 2011 14:45:15 +0000 (10:45 -0400)

Trivial merge