Merge branch 'release'

Updates for 0.23.2

diff --cc emacs/Makefile.local
Simple merge

diff --cc emacs/notmuch-address.el
Simple merge

diff --cc emacs/notmuch-company.el
Simple merge

diff --cc emacs/notmuch-lib.el
Simple merge