]> 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>
Thu, 29 Oct 2009 18:34:33 +0000 (14:34 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 29 Oct 2009 18:34:33 +0000 (14:34 -0400)

Trivial merge