]> 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>
Fri, 30 Apr 2010 21:07:58 +0000 (23:07 +0200)
committerSiebrand Mazeland <s.mazeland@xs4all.nl>
Fri, 30 Apr 2010 21:07:58 +0000 (23:07 +0200)

Trivial merge