Merge branch 'release'

hand fixed conflicts with NEWS

diff --cc NEWS
index 02214143ee9a63000c1af5136a210d2cb17152e4,31d94274da2bfe2fdc06f73ed0b705000941490b..dbb929879988eb041374d8c5c476cdf979637bb1
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,35 -1,18 +1,50 @@@
 +Notmuch 0.23 (UNRELEASED)
 +=========================
 +
 +Emacs
 +-----
 +
 +Face customization is easier
 +
 +  New faces `notmuch-search-flagged-face` and
 +  `notmuch-search-unread-face` are used by default by
 +  `notmuch-search-line-faces`. Customize `notmuch-faces` to modify
 +  them.
 +
 +Ruby Bindings
 +-------------
 +
 +Add support for `notmuch_database_get_all_tags`
 +
 +Go Bindings
 +-----------
 +
 +Go bindings moved to contrib
 +
 +Add support for `notmuch_threads_t` and `notmuch_thread_t`
 +
 +Fixed constant values so they are not all zero anymore.
 +
 +  Previously, it was impossible to open writable database handles,
 +  because DATABASE_MODE_READ_ONLY and DATABASE_MODE_READ_WRITE were
 +  both set to zero.
 +  The same issue occured with sort modes.
 +
+ Notmuch 0.22.2 (2016-09-08)
+ ===========================
+ 
+ Test Suite
+ ----------
+ 
+ Silence gdb more
+ 
+   Have gdb write to a log file instead of stdout, hiding some more
+   (harmless) stderr chatter which causes test failures.
+ 
+ Hardcode fingerprint in PGP/MIME tests
+ 
+   Make the tests more robust against changing GnuPG output formats.
+ 
  Notmuch 0.22.1 (2016-07-19)
  ===========================