]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.7.x' into 0.8.x
authorSarven Capadisli <csarven@controlyourself.ca>
Fri, 10 Apr 2009 17:39:56 +0000 (17:39 +0000)
committerSarven Capadisli <csarven@controlyourself.ca>
Fri, 10 Apr 2009 17:39:56 +0000 (17:39 +0000)
1  2 
README

diff --cc README
Simple merge