]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorZach Copley <zach@status.net>
Sat, 27 Feb 2010 00:23:34 +0000 (00:23 +0000)
committerZach Copley <zach@status.net>
Sat, 27 Feb 2010 00:23:34 +0000 (00:23 +0000)

Trivial merge