]> 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>
Tue, 24 Nov 2009 18:47:56 +0000 (18:47 +0000)
committerZach Copley <zach@status.net>
Tue, 24 Nov 2009 18:47:56 +0000 (18:47 +0000)

Trivial merge