Code

Merge remote-tracking branch 'origin/pr/998'
authorMarc Fournier <marc.fournier@camptocamp.com>
Sun, 12 Apr 2015 07:26:52 +0000 (09:26 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Sun, 12 Apr 2015 07:26:52 +0000 (09:26 +0200)
commitdc7e14787cc4273927d5d0cdbd00fd41a0bee928
tree42f6af8ec10b6b015588a1c7457a0477ac5360c0
parent9e5cdde4656070893ecf59c6234af0593bdda1a0
parent125f3bece6725fba00e5961882692bd671e38bcb
Merge remote-tracking branch 'origin/pr/998'