]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorSarven Capadisli <csarven@status.net>
Thu, 4 Mar 2010 17:51:18 +0000 (12:51 -0500)
committerSarven Capadisli <csarven@status.net>
Thu, 4 Mar 2010 17:51:18 +0000 (12:51 -0500)

Trivial merge