]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
authorSiebrand Mazeland <s.mazeland@xs4all.nl>
Mon, 20 Sep 2010 19:12:56 +0000 (21:12 +0200)
committerSiebrand Mazeland <s.mazeland@xs4all.nl>
Mon, 20 Sep 2010 19:12:56 +0000 (21:12 +0200)

Trivial merge