Merge pull request #2561 from jacquesg/merge-skip No files merged may result in bogus merge conflict error
2014-09-16T13:22:40