Merge branch 'master' into meta

author Avery Pennarun <apenwarr@gmail.com>

Tue, 31 May 2011 04:31:50 +0000 (00:31 -0400)

committer Avery Pennarun <apenwarr@gmail.com>

Tue, 31 May 2011 04:31:50 +0000 (00:31 -0400)
author Avery Pennarun <apenwarr@gmail.com>
Tue, 31 May 2011 04:31:50 +0000 (00:31 -0400)
committer Avery Pennarun <apenwarr@gmail.com>
Tue, 31 May 2011 04:31:50 +0000 (00:31 -0400)
diff --cc lib/bup/git.py
Simple merge
diff --cc lib/bup/index.py
Simple merge
author	Avery Pennarun <apenwarr@gmail.com>
	Tue, 31 May 2011 04:31:50 +0000 (00:31 -0400)
committer	Avery Pennarun <apenwarr@gmail.com>
	Tue, 31 May 2011 04:31:50 +0000 (00:31 -0400)
		1	2
lib/bup/git.py	patch \|	diff1 \|	diff2 \|	blob \| history
lib/bup/index.py	patch \|	diff1 \|	diff2 \|	blob \| history