Merge branch 'release'

diff --combined NEWS
index 2d1114dbcd5f4cc443b6dbcd2efb5528dd2a854a,09c5d9c68541b1898f975e1dd84c5e56b850f169..c34b5462645b0cfe1df1249c31084a04f88afb55
--- 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
@@@ -119,6 -101,12 +119,12 @@@ Generate inline patch fake attachment f
    'git format-patch' instead of just "inline patch". See "Notmuch Show
    Insert Text/Plain Hook" in the notmuch customize interface.
  
+ Enable `notmuch-search-line-faces' by default
+ 
+   Make the `notmuch-search-line-faces' functionality more discoverable
+   for new users by showing "unread" messages bold and "flagged"
+   messages blue by default in the search view.
+ 
  Library changes
  ---------------