]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
authorEvan Prodromou <evan@controlyourself.ca>
Fri, 13 Mar 2009 12:56:04 +0000 (08:56 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Fri, 13 Mar 2009 12:56:04 +0000 (08:56 -0400)
1  2 
README

diff --cc README
Simple merge