Commit 9de6ec52008e3f30a4e8a5c6a13859eefcf86f57

Vicent Marti 2014-07-23T09:41:52

Merge pull request #2477 from ethomson/merge Don't allow conflicts by default