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

Merge remote-tracking branch 'rburgoyne/master'

Conflicts:
	.gitignore
	pandoc.pm
---

ea851582c4ad2002a761df7094610ca3ca84179f
diff --cc pandoc.pm
index ec3706d,2427a5a..2427a5a
mode 100755,100644..100755
--- a/pandoc.pm
+++ b/pandoc.pm