Merge pull request #9 from tonistiigi/binary-encoding

author Romain Beauxis <toots@rastageeks.org>

Wed, 27 Feb 2013 20:36:43 +0000 (12:36 -0800)

committer Romain Beauxis <toots@rastageeks.org>

Wed, 27 Feb 2013 20:36:43 +0000 (12:36 -0800)
author Romain Beauxis <toots@rastageeks.org>
Wed, 27 Feb 2013 20:36:43 +0000 (12:36 -0800)
committer Romain Beauxis <toots@rastageeks.org>
Wed, 27 Feb 2013 20:36:43 +0000 (12:36 -0800)
diff --cc index.js
Simple merge
diff --cc test/buffer.js
Simple merge
author	Romain Beauxis <toots@rastageeks.org>
	Wed, 27 Feb 2013 20:36:43 +0000 (12:36 -0800)
committer	Romain Beauxis <toots@rastageeks.org>
	Wed, 27 Feb 2013 20:36:43 +0000 (12:36 -0800)
		1	2
index.js	patch \|	diff1 \|	diff2 \|	blob \| history
test/buffer.js	patch \|	diff1 \|	diff2 \|	blob \| history