]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
authorZach Copley <zach@controlyourself.ca>
Tue, 7 Jul 2009 20:15:05 +0000 (20:15 +0000)
committerZach Copley <zach@controlyourself.ca>
Tue, 7 Jul 2009 20:15:05 +0000 (20:15 +0000)

Trivial merge