]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorEvan Prodromou <evan@status.net>
Thu, 4 Mar 2010 18:46:05 +0000 (13:46 -0500)
committerEvan Prodromou <evan@status.net>
Thu, 4 Mar 2010 18:46:05 +0000 (13:46 -0500)
1  2 
README

diff --cc README
Simple merge