From: Joey Hess Date: Thu, 17 Nov 2011 22:44:27 +0000 (-0400) Subject: Merge remote-tracking branch 'remotes/pelle/patch/img_size' X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=344a50f5b9594d34eb70bea64c85e46e01765546;p=ikiwiki.git Merge remote-tracking branch 'remotes/pelle/patch/img_size' --- 344a50f5b9594d34eb70bea64c85e46e01765546