]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge remote branch 'gitorious/1.0.x' into 1.0.x
authorEvan Prodromou <evan@status.net>
Tue, 29 Mar 2011 21:31:17 +0000 (17:31 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 29 Mar 2011 21:31:17 +0000 (17:31 -0400)

Trivial merge