Merge branch 'waywardmonkeys-remove-spurious-windows-linefeeds'

This commit is contained in:
Oliver Buchtala 2014-10-15 17:30:46 +02:00
commit 6531b16a56