From: Joey Hess <joey@kitenet.net>
Date: Thu, 17 Nov 2011 22:44:27 +0000 (-0400)
Subject: Merge remote-tracking branch 'remotes/pelle/patch/img_size'
X-Git-Tag: 3.20111107~62
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/344a50f5b9594d34eb70bea64c85e46e01765546

Merge remote-tracking branch 'remotes/pelle/patch/img_size'
---

344a50f5b9594d34eb70bea64c85e46e01765546