]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorEvan Prodromou <evan@status.net>
Tue, 16 Feb 2010 17:46:02 +0000 (12:46 -0500)
committerEvan Prodromou <evan@status.net>
Tue, 16 Feb 2010 17:46:02 +0000 (12:46 -0500)

Trivial merge