]> 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>
Sun, 13 Mar 2011 16:49:31 +0000 (11:49 -0500)
committerEvan Prodromou <evan@status.net>
Sun, 13 Mar 2011 16:49:31 +0000 (11:49 -0500)

Trivial merge