]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x
authorEvan Prodromou <evan@status.net>
Mon, 9 Nov 2009 22:46:48 +0000 (17:46 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 9 Nov 2009 22:46:48 +0000 (17:46 -0500)

Trivial merge