]> 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>
Sat, 5 Dec 2009 23:13:18 +0000 (23:13 +0000)
committerSarven Capadisli <csarven@status.net>
Sat, 5 Dec 2009 23:13:18 +0000 (23:13 +0000)

Trivial merge