Code

Merge remote-tracking branch 'origin/pr/1205'
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 11 Sep 2015 20:30:28 +0000 (22:30 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 11 Sep 2015 20:30:28 +0000 (22:30 +0200)
commit44dda7ba64dfdcab9d5fa8dbffc3bea980f13ab9
tree3fd2abbdefde503b37f65e2c067a8271cd7d2c14
parentd13ba64ef4a78ed9fe16c325d0c60978d29fcac5
parent6efb470041af9f674acfb6ef420e661d6d7b90f7
Merge remote-tracking branch 'origin/pr/1205'