From: François Boulogne <fboulogne sciunto org>
Date: Sun, 4 Aug 2013 21:33:43 +0000 (+0200)
Subject: Merge branch 'master' of github.com:sciunto/ikiwiki-pandoc
X-Git-Url: https://git.g-eek.se/?a=commitdiff_plain;h=0212ad593a1c8ac2fba06f1020d9d11d8eb91a44;p=ikiwiki-pandoc.git

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

0212ad593a1c8ac2fba06f1020d9d11d8eb91a44