From: Javier Sancho <jsf@jsancho.org>
Date: Tue, 13 Feb 2018 12:08:05 +0000 (+0100)
Subject: Merge branch 'master' into english
X-Git-Url: https://git.jsancho.org/?p=blog.git;a=commitdiff_plain;h=bf9ff03aeeb0d686989c16f98a3701e6f708364f

Merge branch 'master' into english
---

bf9ff03aeeb0d686989c16f98a3701e6f708364f