]> 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>
Sat, 7 Mar 2009 05:11:19 +0000 (21:11 -0800)
committerZach Copley <zach@controlyourself.ca>
Sat, 7 Mar 2009 05:11:19 +0000 (21:11 -0800)

Trivial merge