merging master into html-mail-fixes
authorHerve Saint-Amand <git@saintamh.org>
Sun, 12 Feb 2017 21:05:38 +0000 (21:05 +0000)
committerHerve Saint-Amand <git@saintamh.org>
Sun, 12 Feb 2017 21:05:38 +0000 (21:05 +0000)
commita520f1251cf06be665d93037c74116a9f769fbf1
tree576c85b51c7a5c1c8acbfa9c1adf2902508cd380
parentfcba1a9857b7a225a5540b08432be876bde8501f
parenta4eef7dab8b1bd1712c9cdd880dd91cb84681140
merging master into html-mail-fixes