Merge pull request #1506 from bood/master

author Martin Carton <cartonmartin+github@gmail.com>

Tue, 7 Feb 2017 17:56:38 +0000 (18:56 +0100)

committer GitHub <noreply@github.com>

Tue, 7 Feb 2017 17:56:38 +0000 (18:56 +0100)
author Martin Carton <cartonmartin+github@gmail.com>
Tue, 7 Feb 2017 17:56:38 +0000 (18:56 +0100)
committer GitHub <noreply@github.com>
Tue, 7 Feb 2017 17:56:38 +0000 (18:56 +0100)
diff --cc CHANGELOG.md
Simple merge
diff --cc README.md
Simple merge
diff --cc clippy_lints/src/lib.rs
Simple merge
author	Martin Carton <cartonmartin+github@gmail.com>
	Tue, 7 Feb 2017 17:56:38 +0000 (18:56 +0100)
committer	GitHub <noreply@github.com>
	Tue, 7 Feb 2017 17:56:38 +0000 (18:56 +0100)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
README.md	patch \|	diff1 \|	diff2 \|	blob \| history
clippy_lints/src/lib.rs	patch \|	diff1 \|	diff2 \|	blob \| history