]> 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>
Tue, 2 Mar 2010 18:13:51 +0000 (19:13 +0100)
committerSiebrand Mazeland <s.mazeland@xs4all.nl>
Tue, 2 Mar 2010 18:13:51 +0000 (19:13 +0100)

Trivial merge