Merge remote-tracking branch 'remotes/pelle/patch/img_size'
authorJoey Hess <joey@kitenet.net>
Thu, 17 Nov 2011 22:44:27 +0000 (18:44 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 17 Nov 2011 22:44:27 +0000 (18:44 -0400)
commit344a50f5b9594d34eb70bea64c85e46e01765546
treee98fab8c9c14dc44ba193615b395456c394ce7a8
parenta066e0405e22ed846cb21ec26b8ee972413a79e1
parent937c0742322065452a204069e0ba5abc625ec0c6
Merge remote-tracking branch 'remotes/pelle/patch/img_size'