• Show log

    Commit

  • Hash : 903a7616
    Author : Vicent Marti
    Date : 2014-09-16T13:22:40

    Merge pull request #2561 from jacquesg/merge-skip No files merged may result in bogus merge conflict error