]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorEvan Prodromou <evan@status.net>
Tue, 13 Oct 2009 21:21:41 +0000 (17:21 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 13 Oct 2009 21:21:41 +0000 (17:21 -0400)

Trivial merge