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)
commitc680f70bbb6b159fbf7eb937bacaabdc929c093a
treee7d4f50fe64924eb130920512dfeb1fc7251979b
parent5d28f16e3ac93e13f224262ea8aa9cd369fb0c6f
parent55be33df31357954c8d77472f03f2e69de1f0d4a
Merge branch 'master' of git.jsancho.org:blog