]> 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>
Wed, 13 Jan 2010 13:37:04 +0000 (13:37 +0000)
committerSarven Capadisli <csarven@status.net>
Wed, 13 Jan 2010 13:37:04 +0000 (13:37 +0000)

Trivial merge