Merge remote-tracking branch 'origin/pr/1188'
authorMarc Fournier <marc.fournier@camptocamp.com>
Thu, 13 Aug 2015 21:35:57 +0000 (23:35 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Thu, 13 Aug 2015 21:35:57 +0000 (23:35 +0200)
1  2 
configure.ac

diff --cc configure.ac
Simple merge