]> 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>
Sat, 7 May 2011 00:19:05 +0000 (17:19 -0700)
committerEvan Prodromou <evan@status.net>
Sat, 7 May 2011 00:19:05 +0000 (17:19 -0700)

Trivial merge