From: Herve Saint-Amand <git@saintamh.org>
Date: Sun, 12 Feb 2017 21:05:38 +0000 (+0000)
Subject: merging master into html-mail-fixes
X-Git-Tag: live~3546^2~1
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a520f1251cf06be665d93037c74116a9f769fbf1

merging master into html-mail-fixes
---

a520f1251cf06be665d93037c74116a9f769fbf1