Merge branch 'support_for_gs-oolite-v1'
authorPiotr Dymacz <pepe2k@gmail.com>
Mon, 27 Jan 2014 23:57:00 +0000 (00:57 +0100)
committerPiotr Dymacz <pepe2k@gmail.com>
Mon, 27 Jan 2014 23:57:00 +0000 (00:57 +0100)
1  2 
README.md
READMEPL.md

diff --cc README.md
Simple merge
diff --cc READMEPL.md
Simple merge