tree cb515724ce8670ac46c2b6ac67164c9ea76b1075
parent a6d0469b9cab54336c985ddc967cbca3407f2aeb
parent efc967bbb3cf67ec95f70ae42e1943e428944dce
author Luca Milanesio <luca.milanesio@gmail.com> 1782988789 +0100
committer Luca Milanesio <luca.milanesio@gmail.com> 1782988813 +0100

Merge branch 'stable-3.12' into stable-3.13

* stable-3.12:
  Preserve line terminator upon edits

Change-Id: I57620186d0686284f5ae4a1994eda3bff8624f3c