]> 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>
Thu, 7 Jan 2010 00:24:25 +0000 (16:24 -0800)
committerZach Copley <zach@status.net>
Thu, 7 Jan 2010 00:24:25 +0000 (16:24 -0800)

Trivial merge