]> 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>
Wed, 6 Apr 2011 18:23:53 +0000 (14:23 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 6 Apr 2011 18:23:53 +0000 (14:23 -0400)

Trivial merge