commit | 9f145de4dcfbbd2ae8649f4d9e0627e9f018f91b | [log] [download] |
---|---|---|
author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | Mon May 04 15:03:50 2015 +0200 |
committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | Mon May 04 15:03:50 2015 +0200 |
tree | 18bc792ffa2ebb18f7df22c5c5945bdca25ca5b5 | |
parent | e36d56419eb14f3ed0e42cac04d32fff8407aedc [diff] |
Fix merge issue from 1.3 branch