Merge branch 'release'

Conflicts:
	NEWS

Conflicts resolved by hand for date of 0.12 release.

diff --cc NEWS
index 5cfe22202a5c8c6eda87e50fe381705cf86aec54,5c54735837c43f90d3717686e176632673e48f52..631cf1d5219b1029fa116467e8c9bc5d658fe1a6
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,58 -1,4 +1,58 @@@
- Notmuch 0.12 (2012-xx-xx)
 +Notmuch 0.13 (2012-xx-xx)
 +=========================
 +
 +Command-Line Interface
 +----------------------
 +
 +Reply to sender
 +
 +  "notmuch reply" has gained the ability to create a reply template
 +  for replying just to the sender of the message, in addition to reply
 +  to all. The feature is available through the new command line option
 +  --reply-to=(all|sender).
 +
 +JSON reply format
 +
 +  "notmuch reply" can now produce JSON output that contains the headers
 +  for a reply message and full information about the original message
 +  begin replied to. This allows MUAs to create replies intelligtently.
 +  For example, an MUA that can parse HTML might quote HTML parts.
 +
 +  Calling notmuch reply with --format=json imposes the restriction that
 +  only a single message is returned by the search, as replying to
 +  multiple messages does not have a well-defined behavior. The default
 +  retains its current behavior for multiple message replies.
 +
 +Tag exclusion
 +
 +  Tags can be automatically excluded from search results by adding them
 +  to the new 'search.exclude_tags' option in the Notmuch config file.
 +
 +  This behaviour can be overridden by explicitly including an excluded
 +  tag in your query, for example:
 +
 +    notmuch search $your_query and tag:$excluded_tag
 +
 +  Existing users will probably want to run "notmuch setup" again to add
 +  the new well-commented [search] section to the configuration file.
 +
 +  For new configurations, accepting the default setting will cause the
 +  tags "deleted" and "spam" to be excluded, equivalent to running:
 +
 +    notmuch config set search.exclude_tags deleted spam
 +
 +Emacs Interface
 +---------------
 +
 +Reply improvement using the JSON format
 +
 +  Emacs now uses the JSON reply format to create replies. It obeys
 +  the customization variables message-citation-line-format and
 +  message-citation-line-function when creating the first line of the
 +  reply body, and it will quote HTML parts if no text/plain parts are
 +  available.
 +
+ Notmuch 0.12 (2012-03-20)
  =========================
  
  Command-Line Interface

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

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

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

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

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