]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x
authorSarven Capadisli <csarven@status.net>
Sun, 8 Nov 2009 22:56:44 +0000 (22:56 +0000)
committerSarven Capadisli <csarven@status.net>
Sun, 8 Nov 2009 22:56:44 +0000 (22:56 +0000)

Trivial merge