]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing'
authorEvan Prodromou <evan@status.net>
Thu, 14 Jan 2010 02:32:44 +0000 (18:32 -0800)
committerEvan Prodromou <evan@status.net>
Thu, 14 Jan 2010 02:32:44 +0000 (18:32 -0800)

Trivial merge