Commit 7369ea8075fa112bbd4c13f06eeedeb2a4e47153

Vicent Marti 2014-02-04T05:57:25

Merge pull request #2096 from ethomson/merge Corrections for merge working directory validation