]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorSarven Capadisli <csarven@status.net>
Wed, 24 Mar 2010 22:33:00 +0000 (23:33 +0100)
committerSarven Capadisli <csarven@status.net>
Wed, 24 Mar 2010 22:33:00 +0000 (23:33 +0100)

Trivial merge