Problems with messed up line endings

[lluismf (Lluis Martinez)]

I just made a couple of pushes with minimal changes, and one of them messed up the line endings.

This is ok:

Replace deprecated Assert class

This is not:

Use in memory DB depending on a system property

Any ideas? I had similar problems in the past but were solved.