From: Javier Sancho <jsf@jsancho.org>
Date: Thu, 11 Jan 2018 18:11:24 +0000 (+0100)
Subject: Merge branch 'master' into english
X-Git-Url: https://git.jsancho.org/?p=blog.git;a=commitdiff_plain;h=d54d8908e2ad36ccd95139f6b947791ac6100912

Merge branch 'master' into english
---

d54d8908e2ad36ccd95139f6b947791ac6100912