Merge branch 'master' of https://github.com/seanfarley/wiggle

author NeilBrown <neilb@suse.de>

Wed, 9 Oct 2013 00:19:01 +0000 (11:19 +1100)

committer NeilBrown <neilb@suse.de>

Wed, 9 Oct 2013 00:19:01 +0000 (11:19 +1100)
author NeilBrown <neilb@suse.de>
Wed, 9 Oct 2013 00:19:01 +0000 (11:19 +1100)
committer NeilBrown <neilb@suse.de>
Wed, 9 Oct 2013 00:19:01 +0000 (11:19 +1100)
diff --cc Makefile
Simple merge
diff --cc vpatch.c
Simple merge
author	NeilBrown <neilb@suse.de>
	Wed, 9 Oct 2013 00:19:01 +0000 (11:19 +1100)
committer	NeilBrown <neilb@suse.de>
	Wed, 9 Oct 2013 00:19:01 +0000 (11:19 +1100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
vpatch.c	patch \|	diff1 \|	diff2 \|	blob \| history