Merge branch 'release'

add in NEWS from 0.15.2

Conflicts:
	NEWS

diff --combined 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)
  =========================
  
@@@ -208,8 -205,8 +222,8 @@@ Internal test framework change
  
  The emacsclient binary is now user-configurable
  
 -  The test framework now accepts TEST_EMACSCLIENT in addition to
 -  TEST_EMACS for configuring the emacsclient to use.  This is
 +  The test framework now accepts `TEST_EMACSCLIENT` in addition to
 +  `TEST_EMACS` for configuring the emacsclient to use.  This is
    necessary to avoid using an old emacsclient with a new emacs, which
    can result in buggy behavior.
  

diff --combined man/man1/notmuch.1
index 55e2d166facaadcb02d9aec6f899b84ce94ecca3,a65730841669c5f705af96e947e70ad2b6373463..e645a351fe3c8c35d81a0f4d6e66ab802d0d2d48
--- 1/man/man1/notmuch.1
--- 2/man/man1/notmuch.1
+++ b/man/man1/notmuch.1
@@@ -16,12 -16,12 +16,12 @@@
  .\" along with this program.  If not, see http://www.gnu.org/licenses/ .
  .\"
  .\" Author: Carl Worth <cworth@cworth.org>
- .TH NOTMUCH 1 2013-01-24 "Notmuch 0.15.1"
+ .TH NOTMUCH 1 2013-02-17 "Notmuch 0.15.2"
  .SH NAME
  notmuch \- thread-based email index, search, and tagging
  .SH SYNOPSIS
  .B notmuch
 -.IR command " [" args " ...]"
 +.RI "[" option " ...] " command  " [" arg " ...]"
  .SH DESCRIPTION
  Notmuch is a command-line based program for indexing, searching,
  reading, and tagging large collections of email messages.
@@@ -50,26 -50,6 +50,26 @@@ interfaces to notmuch. The emacs-based 
  in the Notmuch source distribution) is probably the most widely used at
  this time.
  
 +.SH OPTIONS
 +
 +Supported global options for
 +.B notmuch
 +include
 +
 +.RS 4
 +.TP 4
 +.B \-\-help
 +
 +Print a synopsis of available commands and exit.
 +.RE
 +
 +.RS 4
 +.TP 4
 +.B \-\-version
 +
 +Print the installed version of notmuch, and exit.
 +.RE
 +
  .SH COMMANDS
  
  
@@@ -147,14 -127,6 +147,14 @@@ behavior of notmuch
  .B NOTMUCH_CONFIG
  Specifies the location of the notmuch configuration file. Notmuch will
  use ${HOME}/.notmuch\-config if this variable is not set.
 +
 +.TP
 +.B NOTMUCH_TALLOC_REPORT
 +Location to write a talloc memory usage report. See
 +.B talloc_enable_leak_report_full
 +in \fBtalloc\fR(3)
 +for more information.
 +
  .SH SEE ALSO
  
  \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1),