From: François Boulogne <fboulogne sciunto org>
Date: Sat, 4 May 2013 20:01:07 +0000 (+0200)
Subject: Merge remote-tracking branch 'bk/master'
X-Git-Url: https://git.g-eek.se/?a=commitdiff_plain;h=50527f0b085b0a73a1d48a07f33939efb2cbbfd1;p=ikiwiki-pandoc.git

Merge remote-tracking branch 'bk/master'

Conflicts:
	pandoc.pm
---

50527f0b085b0a73a1d48a07f33939efb2cbbfd1