From: François Boulogne <fboulogne sciunto org>
Date: Sun, 31 Jan 2016 20:30:21 +0000 (-0500)
Subject: Merge branch 'master' of github.com:sciunto-org/ikiwiki-pandoc
X-Git-Url: https://git.g-eek.se/?a=commitdiff_plain;h=27c25086ac6d99a017cc78b071dfe04c6c941c46;p=ikiwiki-pandoc.git

Merge branch 'master' of github.com:sciunto-org/ikiwiki-pandoc
---

27c25086ac6d99a017cc78b071dfe04c6c941c46