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

Merge branch 'master' into english
---

1f7a4c617283706f85d94b5c4925d86d92f510f9