]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
authorZach Copley <zach@controlyourself.ca>
Thu, 5 Feb 2009 20:02:47 +0000 (20:02 +0000)
committerZach Copley <zach@controlyourself.ca>
Thu, 5 Feb 2009 20:02:47 +0000 (20:02 +0000)

Trivial merge