]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorZach Copley <zach@status.net>
Fri, 13 Aug 2010 23:53:44 +0000 (23:53 +0000)
committerZach Copley <zach@status.net>
Fri, 13 Aug 2010 23:53:44 +0000 (23:53 +0000)

Trivial merge