nmera/line-ending-test — pull request #15 by nmera (2012-07-04 00:07:42+00:00)
Title: sample13-1

conflict merge of pull request @no.1