Merge pull request #483 from Manishearth/bored

author llogiq <bogusandre@gmail.com>

Mon, 7 Dec 2015 20:47:10 +0000 (21:47 +0100)

committer llogiq <bogusandre@gmail.com>

Mon, 7 Dec 2015 20:47:10 +0000 (21:47 +0100)
author llogiq <bogusandre@gmail.com>
Mon, 7 Dec 2015 20:47:10 +0000 (21:47 +0100)
committer llogiq <bogusandre@gmail.com>
Mon, 7 Dec 2015 20:47:10 +0000 (21:47 +0100)
diff --cc README.md
Simple merge
diff --cc src/lib.rs
Simple merge
author	llogiq <bogusandre@gmail.com>
	Mon, 7 Dec 2015 20:47:10 +0000 (21:47 +0100)
committer	llogiq <bogusandre@gmail.com>
	Mon, 7 Dec 2015 20:47:10 +0000 (21:47 +0100)
		1	2
README.md	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib.rs	patch \|	diff1 \|	diff2 \|	blob \| history