Merge remote-tracking branch 'origin/pr/1181'
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 3 Aug 2015 21:26:55 +0000 (23:26 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 3 Aug 2015 21:26:55 +0000 (23:26 +0200)
commit7e5979cba23f52cc8b2e188f1d205d4b0b8a2fa7
treeb3df35917d8a0e6014de23c155dcd7ca05ef097e
parent5dcf6b9a54e94c2fa829c9077bfb3e829c6e89ba
parent939f4098d43c2934a9a97e076d64a7504613b872
Merge remote-tracking branch 'origin/pr/1181'