]> 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>
Fri, 19 Aug 2011 00:27:55 +0000 (17:27 -0700)
committerEvan Prodromou <evan@status.net>
Fri, 19 Aug 2011 00:27:55 +0000 (17:27 -0700)

Trivial merge