Merge branch 'release'

Conflicts:
	NEWS

Inserted news from 0.15.1

diff --cc NEWS
index 9db9daf01498bad41319977936e6eaabd0c05c2d,97f23058150d1d90daab39d9acbee53df626c4cf..9bd7a11e7513b763e0ead86d8c55eb1c7d87c794
--- 1/NEWS
--- 2/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)
  =========================
  

diff --cc man/man1/notmuch.1
Simple merge