Merge remote-tracking branch 'origin/pr/1264'
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 14 Oct 2015 06:47:39 +0000 (08:47 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 14 Oct 2015 06:47:39 +0000 (08:47 +0200)
commitdadf85ade12c75675cd20932e26d723d17a718f1
tree13c82121372aba9b3d4398a27c0d4cb849b58f4e
parent73de67494a4f5d9a698f2a5ab93f85e19bccb90a
parente9ad0b82b3620ba9ed6754e9324f9d2b9ff027c3
Merge remote-tracking branch 'origin/pr/1264'