2dfa7ddbb73b9b34bb3172b640427cd1f929fd14 bc10e72c80c78d3ff240a2eb7b5018594e74c5d0 Norman Clarke norman@addthree.com http://github.com/norman/has_image/commit/bda419354f2cdd5ea331be2c45158fc502778e96 bda419354f2cdd5ea331be2c45158fc502778e96 2008-08-18T08:37:50-07:00 2008-08-18T08:37:50-07:00 Merge branch 'master' of git@github.com:norman/has_image Conflicts: CHANGELOG has_image.gemspec fced65bf772c9bd064918f42d83d2763ed56c44e Norman Clarke norman@addthree.com