Merge branch 'master' of http://nmbug.notmuchmail.org/git/nmbug-tags
drwxr-xr-x - tags