Merge remote branch 'origin/master' into vim

author Bart Trojanowski <bart@jukie.net>

Fri, 27 Nov 2009 22:49:54 +0000 (17:49 -0500)

committer Bart Trojanowski <bart@jukie.net>

Fri, 27 Nov 2009 22:49:54 +0000 (17:49 -0500)
author Bart Trojanowski <bart@jukie.net>
Fri, 27 Nov 2009 22:49:54 +0000 (17:49 -0500)
committer Bart Trojanowski <bart@jukie.net>
Fri, 27 Nov 2009 22:49:54 +0000 (17:49 -0500)
diff --cc lib/message.cc
Simple merge
diff --cc lib/notmuch.h
Simple merge
author	Bart Trojanowski <bart@jukie.net>
	Fri, 27 Nov 2009 22:49:54 +0000 (17:49 -0500)
committer	Bart Trojanowski <bart@jukie.net>
	Fri, 27 Nov 2009 22:49:54 +0000 (17:49 -0500)
		1	2
lib/message.cc	patch \|	diff1 \|	diff2 \|	blob \| history
lib/notmuch.h	patch \|	diff1 \|	diff2 \|	blob \| history