Merge remote-tracking branch 'origin/pr/1191'
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 3 Aug 2015 21:27:10 +0000 (23:27 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 3 Aug 2015 21:27:10 +0000 (23:27 +0200)
commit6688b2257d3276735e82492adaa9a3944b9ef6c1
treec7ad28d5a9c3bda8d500e67f0b5f33196da136a7
parent7e5979cba23f52cc8b2e188f1d205d4b0b8a2fa7
parenta81543f5022140234dc40c8bb4a213130489ccc2
Merge remote-tracking branch 'origin/pr/1191'