]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge remote branch 'gitorious/1.0.x' into 1.0.x
authorEvan Prodromou <evan@status.net>
Mon, 18 Oct 2010 20:43:08 +0000 (16:43 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 18 Oct 2010 20:43:08 +0000 (16:43 -0400)

Trivial merge