From: Simon McVittie <smcv@debian.org>
Date: Fri, 12 Sep 2014 20:59:00 +0000 (+0100)
Subject: Merge branch 'ready/imgforpdf-and-more'
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/9be3f951166e5d1256a806a8db25b7c5c7021acb?hp=-c

Merge branch 'ready/imgforpdf-and-more'
---

9be3f951166e5d1256a806a8db25b7c5c7021acb