]> 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>
Tue, 3 Feb 2009 19:30:59 +0000 (11:30 -0800)
committerZach Copley <zach@controlyourself.ca>
Tue, 3 Feb 2009 19:30:59 +0000 (11:30 -0800)

Trivial merge