]> 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>
Sun, 8 Feb 2009 02:18:08 +0000 (18:18 -0800)
committerZach Copley <zach@controlyourself.ca>
Sun, 8 Feb 2009 02:18:08 +0000 (18:18 -0800)

Trivial merge