]> 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>
Fri, 26 Feb 2010 22:54:03 +0000 (22:54 +0000)
committerZach Copley <zach@status.net>
Fri, 26 Feb 2010 22:54:03 +0000 (22:54 +0000)

Trivial merge