Merge pull request #188 from bsalomon/master

Fix line endings in Test/100.conf
This commit is contained in:
John Kessenich 2016-03-03 21:57:51 -07:00
commit be0fa3c4c0