Merge remote-tracking branch 'origin/pr/1254'
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 11 Sep 2015 20:17:20 +0000 (22:17 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 11 Sep 2015 20:17:20 +0000 (22:17 +0200)
commit06d15fe3e9c6d6cd72fb97643b29c4be344c0117
tree611d46d7478264b1603f67e997ad83233f14db99
parent1c790e620e1d9b8f550290959e7cd8ec6ba549e9
parent9e6395fc062c3cda48b612e90c0dca64a6c5236c
Merge remote-tracking branch 'origin/pr/1254'