From: Javier Sancho <jsf@jsancho.org>
Date: Tue, 17 Jan 2017 11:33:32 +0000 (+0000)
Subject: Merge branch 'master' of git.jsancho.org:blog
X-Git-Url: https://git.jsancho.org/?p=blog.git;a=commitdiff_plain;h=c680f70bbb6b159fbf7eb937bacaabdc929c093a;hp=5d28f16e3ac93e13f224262ea8aa9cd369fb0c6f

Merge branch 'master' of git.jsancho.org:blog
---