]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
authorEvan Prodromou <evan@status.net>
Thu, 5 May 2011 19:09:10 +0000 (12:09 -0700)
committerEvan Prodromou <evan@status.net>
Thu, 5 May 2011 19:09:10 +0000 (12:09 -0700)

Trivial merge