]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing'
authorZach Copley <zach@status.net>
Fri, 29 Jan 2010 06:08:55 +0000 (06:08 +0000)
committerZach Copley <zach@status.net>
Fri, 29 Jan 2010 06:08:55 +0000 (06:08 +0000)

Trivial merge