]> 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>
Mon, 21 Dec 2009 22:07:59 +0000 (22:07 +0000)
committerSarven Capadisli <csarven@status.net>
Mon, 21 Dec 2009 22:07:59 +0000 (22:07 +0000)

Trivial merge