Merge remote-tracking branch 'terminalmage/readme'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 21 Aug 2014 23:46:46 +0000 (01:46 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 21 Aug 2014 23:46:46 +0000 (01:46 +0200)
1  2 
README.md

diff --cc README.md
Simple merge