Merge branch 'mm/lockfile-error-message' into maint

* mm/lockfile-error-message: lockfile: improve error message when lockfile exists lockfile: mark strings for translation

Junio C Hamano committed Apr 14, 2016 at 18:37 UTC bb0b4a9b5e4daf481d48aa0a3e6b806c699e2cd2

No changes.