]> 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>
Fri, 13 Feb 2009 05:45:06 +0000 (05:45 +0000)
committerZach Copley <zach@controlyourself.ca>
Fri, 13 Feb 2009 05:45:06 +0000 (05:45 +0000)

Trivial merge