]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge remote branch 'gitorious/testing' into testing
authorEvan Prodromou <evan@status.net>
Mon, 10 Jan 2011 19:59:07 +0000 (14:59 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 10 Jan 2011 19:59:07 +0000 (14:59 -0500)

Trivial merge