]> 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>
Mon, 15 Jun 2009 22:52:14 +0000 (22:52 +0000)
committerZach Copley <zach@controlyourself.ca>
Mon, 15 Jun 2009 22:52:14 +0000 (22:52 +0000)

Trivial merge