]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
authorEvan Prodromou <evan@status.net>
Tue, 21 Jun 2011 18:12:24 +0000 (14:12 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 21 Jun 2011 18:12:24 +0000 (14:12 -0400)

Trivial merge