]> 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, 22 Jan 2010 18:19:02 +0000 (19:19 +0100)
committerSarven Capadisli <csarven@status.net>
Fri, 22 Jan 2010 18:19:02 +0000 (19:19 +0100)

Trivial merge