]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.7.x' into 0.8.x
authorEvan Prodromou <evan@controlyourself.ca>
Fri, 6 Feb 2009 20:38:10 +0000 (15:38 -0500)
committerEvan Prodromou <evan@controlyourself.ca>
Fri, 6 Feb 2009 20:38:10 +0000 (15:38 -0500)
1  2 
README

diff --cc README
Simple merge