Merge branch 'release'

diff --combined NEWS
index a73991496ae5d6c994224b3678623b02426ef5d9,18760ce79e139d87476e71f69af794d889a42796..2d1114dbcd5f4cc443b6dbcd2efb5528dd2a854a
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -11,24 -11,6 +11,24 @@@ Reply to sende
    to all. The feature is available through the new command line option
    --reply-to=(all|sender).
  
 +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
 +
  Mail store folder/file ignore
  
     A new configuration option, `new.ignore`, lets users specify a
@@@ -38,6 -20,12 +38,12 @@@
     NOTE: *Every* file/directory that goes by one of those names will
     be ignored, independent of its depth/location in the mail store.
  
+ Manual page for notmuch configuration options
+ 
+   The notmuch CLI configuration file options are now documented in the
+   notmuch-config(1) manual page in addition to the configuration file
+   itself.
+ 
  Emacs Interface
  ---------------
  
@@@ -86,6 -74,33 +92,33 @@@ New function
    optionally visiting a URI to the current message at one of a number
    of Mailing List Archives.
  
+ Fix MML tag quoting in replies
+ 
+   The MML tag quoting fix of 0.11.1 unintentionally quoted tags
+   inserted in `message-setup-hook'. Quoting is now limited to the
+   cited message.
+ 
+ Show view archiving key binding changes
+ 
+   The show view archiving key bindings 'a' and 'x' now remove the
+   "inbox" tag from the current message only (instead of thread), and
+   move to the next message. At the last message, 'a' proceeds to the
+   next thread in search results, and 'x' returns to search
+   results. The thread archiving functions are now available in 'A' and
+   'X'.
+ 
+ Support text/calendar MIME type
+ 
+   The text/calendar MIME type is now supported in addition to
+   text/x-vcalendar.
+ 
+ Generate inline patch fake attachment file names from message subject
+ 
+   Use the message subject to generate file names for the inline patch
+   fake attachments. The names are now similar to the ones generated by
+   'git format-patch' instead of just "inline patch". See "Notmuch Show
+   Insert Text/Plain Hook" in the notmuch customize interface.
+ 
  Library changes
  ---------------