Merge branch 'release'

add in NEWS from 0.15.2

Conflicts:
	NEWS

diff --cc NEWS
index 06ad4b1c08e1c80abfcaee2ca9db78976a3e8113,1cea2ecb60878db63b9f65c4ae2a463bf6c4560c..bd2039b51c5c4508df454caa38e0e9a6d867004e
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,20 -1,17 +1,34 @@@
 +Notmuch 0.16 (2013-MM-DD)
 +=========================
 +
 +Command-Line Interface
 +----------------------
 +
 +Deprecated commands "part" and "search-tags" are removed.
 +
 +Vim Front-End
 +-------------
 +
 +The vim based front end to notmuch is deprecated and moved to contrib.
 +We haven't been able to support this as well as we would like, and it
 +has accumulated bugs and gaps in functionality.  We recommend that
 +people packaging notmuch no longer provide binary packages for
 +notmuch-vim, but of course that is their decision.
 +
+ Notmuch 0.15.2 (2013-02-17)
+ ===========================
+ 
+ Build fixes
+ -----------
+ 
+ Update dependencies to avoid problems when building in parallel.
+ 
+ Internal test framework changes
+ -------------------------------
+ 
+ Adjust Emacs test watchdog mechanism to cope with `process-attributes`
+ being unimplimented.
+ 
  Notmuch 0.15.1 (2013-01-24)
  =========================
  

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