Merge pull request #1133 from atm-maxime/develop

CRLF issue
This commit is contained in:
Juanjo Menent 2013-07-26 03:45:35 -07:00
commit 6fb2fe03d0
2 changed files with 16 additions and 16 deletions