From: David Bremner <bremner@debian.org>
Date: Mon, 18 Jul 2011 01:18:58 +0000 (-0300)
Subject: Merge commit '0.6.1'
X-Git-Tag: 0.7_rc1~5
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=a900ddaba661d693764d1a5f58f8b946bb788c4a

Merge commit '0.6.1'

Conflicts:
	lib/Makefile.local

The conflicts are from three kinds of commits not merged into release:
    - typo fixes
    - removal of debug output
    - fix for CLEAN rule

That were never merged into the release branch.
---

a900ddaba661d693764d1a5f58f8b946bb788c4a