]> 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>
Tue, 2 Feb 2010 15:07:35 +0000 (16:07 +0100)
committerSarven Capadisli <csarven@status.net>
Tue, 2 Feb 2010 15:07:35 +0000 (16:07 +0100)

Trivial merge