]> 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, 3 Apr 2009 21:22:10 +0000 (14:22 -0700)
committerZach Copley <zach@controlyourself.ca>
Fri, 3 Apr 2009 21:22:10 +0000 (14:22 -0700)

Trivial merge