Merge branch '3.0/develop' into 3.1/develop
commit97fd8ffd050925d1370b963c5807d5fcb17bddda
authorWoody Gilk <woody.gilk@kohanaframework.org>
Thu, 10 Feb 2011 21:34:22 +0000 (10 15:34 -0600)
committerWoody Gilk <woody.gilk@kohanaframework.org>
Thu, 10 Feb 2011 21:34:22 +0000 (10 15:34 -0600)
treea723b1db12ba043eae24a02b93532c85f5efb9f2
parent697c986223c44375af7d684abd75c78e3007c215
parentae06fbd46e69875c67bd269c9a68515b4f2b308d
Merge branch '3.0/develop' into 3.1/develop
classes/kohana/image.php