From: David Bremner <bremner@debian.org>
Date: Fri, 25 Jan 2013 02:29:09 +0000 (-0400)
Subject: Merge branch 'release'
X-Git-Tag: 0.16_rc1~219
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=7264732a794b8d59b0aeef395e74381beb4b90f7

Merge branch 'release'

Conflicts:
	NEWS

Inserted news from 0.15.1
---

7264732a794b8d59b0aeef395e74381beb4b90f7
diff --cc NEWS
index 9db9daf0,97f23058..9bd7a11e
--- a/NEWS
+++ b/NEWS
@@@ -1,11 -1,12 +1,20 @@@
 +Notmuch 0.16 (2013-MM-DD)
 +=========================
 +
 +Command-Line Interface
 +----------------------
 +
 +Deprecated commands "part" and "search-tags" are removed.
 +
+ Notmuch 0.15.1 (2013-01-24)
+ =========================
+ 
+ Internal test framework changes
+ -------------------------------
+ 
+ Set a default value for TERM when running tests. This fixes certain
+ build failures in non-interactive environments.
+ 
  Notmuch 0.15 (2013-01-18)
  =========================