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

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

Fri, 9 Aug 2013 15:06:28 +0000 (17:06 +0200)

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

Fri, 9 Aug 2013 15:06:28 +0000 (17:06 +0200)
author Marc Fournier <marc.fournier@camptocamp.com>
Fri, 9 Aug 2013 15:06:28 +0000 (17:06 +0200)
committer Marc Fournier <marc.fournier@camptocamp.com>
Fri, 9 Aug 2013 15:06:28 +0000 (17:06 +0200)
diff --cc AUTHORS
Simple merge
diff --cc README
Simple merge
diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
author	Marc Fournier <marc.fournier@camptocamp.com>
	Fri, 9 Aug 2013 15:06:28 +0000 (17:06 +0200)
committer	Marc Fournier <marc.fournier@camptocamp.com>
	Fri, 9 Aug 2013 15:06:28 +0000 (17:06 +0200)
		1	2
AUTHORS	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history