]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing'
authorEvan Prodromou <evan@status.net>
Tue, 8 Feb 2011 18:39:41 +0000 (13:39 -0500)
committerEvan Prodromou <evan@status.net>
Tue, 8 Feb 2011 18:39:41 +0000 (13:39 -0500)

Trivial merge