]> 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>
Fri, 1 Jan 2010 21:12:22 +0000 (21:12 +0000)
committerSarven Capadisli <csarven@status.net>
Fri, 1 Jan 2010 21:12:22 +0000 (21:12 +0000)

Trivial merge