Merge remote-tracking branch 'origin/pr/603'
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 8 Aug 2014 07:28:31 +0000 (09:28 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 8 Aug 2014 07:28:31 +0000 (09:28 +0200)
1  2 
AUTHORS
configure.ac

diff --cc AUTHORS
Simple merge
diff --cc configure.ac
Simple merge