]> 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>
Thu, 17 Dec 2009 20:29:44 +0000 (15:29 -0500)
committerSarven Capadisli <csarven@status.net>
Thu, 17 Dec 2009 20:29:44 +0000 (15:29 -0500)

Trivial merge