]> 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>
Thu, 1 Sep 2011 15:30:24 +0000 (11:30 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 1 Sep 2011 15:30:24 +0000 (11:30 -0400)

Trivial merge