nmera/line-ending-test — pull request #16 by nmera (2012-07-04 00:08:04+00:00)
Title: commit: sample13-2 refs #4

conflict merge of pull request @no.2