]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' into 1.0.x
authorEvan Prodromou <evan@status.net>
Thu, 9 Sep 2010 19:02:53 +0000 (15:02 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 9 Sep 2010 19:02:53 +0000 (15:02 -0400)
1  2 
README

diff --cc README
Simple merge