]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing'
authorEvan Prodromou <evan@status.net>
Fri, 29 Jan 2010 02:12:34 +0000 (21:12 -0500)
committerEvan Prodromou <evan@status.net>
Fri, 29 Jan 2010 02:12:34 +0000 (21:12 -0500)

Trivial merge