Merge remote-tracking branch 'origin/pr/1260'
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 11 Sep 2015 20:34:18 +0000 (22:34 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 11 Sep 2015 20:34:18 +0000 (22:34 +0200)
commitfc4db4e3f7ca3eac57bff54d3ced3ec0c3bcda70
tree5f35147f539770cd83272c52bfaa0e4375d4471c
parent44dda7ba64dfdcab9d5fa8dbffc3bea980f13ab9
parent5afcfb35fd1c22abcc818ee4ec7b6931c424e79b
Merge remote-tracking branch 'origin/pr/1260'