]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing'
authorEvan Prodromou <evan@status.net>
Wed, 3 Mar 2010 23:20:45 +0000 (18:20 -0500)
committerEvan Prodromou <evan@status.net>
Wed, 3 Mar 2010 23:20:45 +0000 (18:20 -0500)

Trivial merge