Merge remote-tracking branch 'origin/pr/1175'
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 3 Aug 2015 21:26:21 +0000 (23:26 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 3 Aug 2015 21:26:21 +0000 (23:26 +0200)
commit5dcf6b9a54e94c2fa829c9077bfb3e829c6e89ba
tree42ac1a92b4736e47156e0c2d5ad63abbff05ee0b
parenta5ee52cc21aa6717b0c96fadb701a08b22c30928
parentc14e85876cf328d10e2addd5fa8b60afd21f02f1
Merge remote-tracking branch 'origin/pr/1175'