Merge pull request #5928 from keszybz/libidn2

author Lennart Poettering <lennart@poettering.net>

Fri, 12 May 2017 10:01:40 +0000 (12:01 +0200)

committer GitHub <noreply@github.com>

Fri, 12 May 2017 10:01:40 +0000 (12:01 +0200)
author Lennart Poettering <lennart@poettering.net>
Fri, 12 May 2017 10:01:40 +0000 (12:01 +0200)
committer GitHub <noreply@github.com>
Fri, 12 May 2017 10:01:40 +0000 (12:01 +0200)
diff --cc README
Simple merge
diff --cc configure.ac
Simple merge
diff --cc meson.build
Simple merge
diff --cc meson_options.txt
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Fri, 12 May 2017 10:01:40 +0000 (12:01 +0200)
committer	GitHub <noreply@github.com>
	Fri, 12 May 2017 10:01:40 +0000 (12:01 +0200)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
meson_options.txt	patch \|	diff1 \|	diff2 \|	blob \| history