Merge branch 'ready/imgforpdf-and-more'
authorSimon McVittie <smcv@debian.org>
Fri, 12 Sep 2014 20:59:00 +0000 (21:59 +0100)
committerSimon McVittie <smcv@debian.org>
Fri, 12 Sep 2014 20:59:00 +0000 (21:59 +0100)

Trivial merge