Merge pull request #4771 from keszybz/udev-property-ordering

author Martin Pitt <martin.pitt@ubuntu.com>

Mon, 12 Dec 2016 15:03:52 +0000 (16:03 +0100)

committer GitHub <noreply@github.com>

Mon, 12 Dec 2016 15:03:52 +0000 (16:03 +0100)
author Martin Pitt <martin.pitt@ubuntu.com>
Mon, 12 Dec 2016 15:03:52 +0000 (16:03 +0100)
committer GitHub <noreply@github.com>
Mon, 12 Dec 2016 15:03:52 +0000 (16:03 +0100)
diff --cc Makefile.am
Simple merge
diff --cc src/basic/util.c
Simple merge
author	Martin Pitt <martin.pitt@ubuntu.com>
	Mon, 12 Dec 2016 15:03:52 +0000 (16:03 +0100)
committer	GitHub <noreply@github.com>
	Mon, 12 Dec 2016 15:03:52 +0000 (16:03 +0100)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/basic/util.c	patch \|	diff1 \|	diff2 \|	blob \| history