Commit 3ddd0d929d329c09c5bf37258b81c76b52c68c56

Carlos Martín Nieto 2014-06-24T17:55:15

Merge remote-tracking branch 'upstream/cmn/mixed-eol-passthrough'