]> 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, 23 May 2011 16:29:08 +0000 (12:29 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 23 May 2011 16:29:08 +0000 (12:29 -0400)

Trivial merge