Merge remote-tracking branch 'origin/pr/603'

author Marc Fournier <marc.fournier@camptocamp.com>

Fri, 8 Aug 2014 07:28:31 +0000 (09:28 +0200)

committer Marc Fournier <marc.fournier@camptocamp.com>

Fri, 8 Aug 2014 07:28:31 +0000 (09:28 +0200)
author Marc Fournier <marc.fournier@camptocamp.com>
Fri, 8 Aug 2014 07:28:31 +0000 (09:28 +0200)
committer Marc Fournier <marc.fournier@camptocamp.com>
Fri, 8 Aug 2014 07:28:31 +0000 (09:28 +0200)
diff --cc AUTHORS
Simple merge
diff --cc configure.ac
Simple merge
author	Marc Fournier <marc.fournier@camptocamp.com>
	Fri, 8 Aug 2014 07:28:31 +0000 (09:28 +0200)
committer	Marc Fournier <marc.fournier@camptocamp.com>
	Fri, 8 Aug 2014 07:28:31 +0000 (09:28 +0200)
		1	2
AUTHORS	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history