]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
authorZach Copley <zach@status.net>
Tue, 27 Sep 2011 04:33:00 +0000 (04:33 +0000)
committerZach Copley <zach@status.net>
Tue, 27 Sep 2011 04:33:00 +0000 (04:33 +0000)

Trivial merge