]> 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>
Tue, 16 Aug 2011 19:59:06 +0000 (15:59 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 16 Aug 2011 19:59:06 +0000 (15:59 -0400)

Trivial merge