From: Javier Sancho <jsf@jsancho.org>
Date: Mon, 26 Feb 2018 16:06:34 +0000 (+0100)
Subject: Merge branch 'master' into english
X-Git-Url: https://git.jsancho.org/?p=blog.git;a=commitdiff_plain;h=16b2c33322417be6d88ecb431116c8fcdd0677d1

Merge branch 'master' into english
---

16b2c33322417be6d88ecb431116c8fcdd0677d1