]> 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>
Wed, 16 Sep 2009 15:57:26 +0000 (11:57 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 16 Sep 2009 15:57:26 +0000 (11:57 -0400)

Trivial merge