]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x
authorZach Copley <zach@controlyourself.ca>
Tue, 15 Sep 2009 21:40:57 +0000 (14:40 -0700)
committerZach Copley <zach@controlyourself.ca>
Tue, 15 Sep 2009 21:40:57 +0000 (14:40 -0700)

Trivial merge