Merge pull request #226 from hugovk/master

author Mike Verdone <redacted>

Sat, 30 Aug 2014 14:06:49 +0000 (16:06 +0200)

committer Mike Verdone <redacted>

Sat, 30 Aug 2014 14:06:49 +0000 (16:06 +0200)
author Mike Verdone <redacted>
Sat, 30 Aug 2014 14:06:49 +0000 (16:06 +0200)
committer Mike Verdone <redacted>
Sat, 30 Aug 2014 14:06:49 +0000 (16:06 +0200)
diff --cc .travis.yml
Simple merge
diff --cc README
Simple merge
author	Mike Verdone <redacted>
	Sat, 30 Aug 2014 14:06:49 +0000 (16:06 +0200)
committer	Mike Verdone <redacted>
	Sat, 30 Aug 2014 14:06:49 +0000 (16:06 +0200)
		1	2
.travis.yml	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history