Merge pull request #1741 from ktsaou/master

author Costa Tsaousis <costa@tsaousis.gr>

Wed, 8 Feb 2017 19:45:08 +0000 (21:45 +0200)

committer GitHub <noreply@github.com>

Wed, 8 Feb 2017 19:45:08 +0000 (21:45 +0200)
author Costa Tsaousis <costa@tsaousis.gr>
Wed, 8 Feb 2017 19:45:08 +0000 (21:45 +0200)
committer GitHub <noreply@github.com>
Wed, 8 Feb 2017 19:45:08 +0000 (21:45 +0200)
diff --cc configure.ac
Simple merge
diff --cc src/common.h
Simple merge
author	Costa Tsaousis <costa@tsaousis.gr>
	Wed, 8 Feb 2017 19:45:08 +0000 (21:45 +0200)
committer	GitHub <noreply@github.com>
	Wed, 8 Feb 2017 19:45:08 +0000 (21:45 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/common.h	patch \|	diff1 \|	diff2 \|	blob \| history