Merge tag '0.20_rc1'
[notmuch] / contrib /
drwxr-xr-x   ..
drwxr-xr-x - notmuch-mutt
drwxr-xr-x - notmuch-vim