Merge branch 'master' into 14a_rework3

author Oleg Moiseenko <olegmsn@gmail.com>

Thu, 2 Nov 2017 12:14:55 +0000 (14:14 +0200)

committer GitHub <noreply@github.com>

Thu, 2 Nov 2017 12:14:55 +0000 (14:14 +0200)
author Oleg Moiseenko <olegmsn@gmail.com>
Thu, 2 Nov 2017 12:14:55 +0000 (14:14 +0200)
committer GitHub <noreply@github.com>
Thu, 2 Nov 2017 12:14:55 +0000 (14:14 +0200)
diff --cc armsrc/iso14443a.c
Simple merge
diff --cc client/cmdhf14a.c
Simple merge
author	Oleg Moiseenko <olegmsn@gmail.com>
	Thu, 2 Nov 2017 12:14:55 +0000 (14:14 +0200)
committer	GitHub <noreply@github.com>
	Thu, 2 Nov 2017 12:14:55 +0000 (14:14 +0200)
		1	2
armsrc/iso14443a.c	patch \|	diff1 \|	diff2 \|	blob \| history
client/cmdhf14a.c	patch \|	diff1 \|	diff2 \|	blob \| history