Merge branch 'master' of git.jsancho.org:blog
authorJavier Sancho <jsf@jsancho.org>
Tue, 17 Jan 2017 11:33:32 +0000 (11:33 +0000)
committerJavier Sancho <jsf@jsancho.org>
Tue, 17 Jan 2017 11:33:32 +0000 (11:33 +0000)

Trivial merge