]> 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, 6 Mar 2009 21:35:10 +0000 (13:35 -0800)
committerZach Copley <zach@controlyourself.ca>
Fri, 6 Mar 2009 21:35:10 +0000 (13:35 -0800)

Trivial merge