]> 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>
Wed, 3 Mar 2010 22:48:42 +0000 (17:48 -0500)
committerSarven Capadisli <csarven@status.net>
Wed, 3 Mar 2010 22:48:42 +0000 (17:48 -0500)

Trivial merge