Merge branch '3.0/develop' into 3.1/develop
commit1b5fb0f4fd4a93742d30fe08095e8248738fbcf2
authorWoody Gilk <woody.gilk@kohanaframework.org>
Mon, 10 Jan 2011 15:55:50 +0000 (10 09:55 -0600)
committerWoody Gilk <woody.gilk@kohanaframework.org>
Mon, 10 Jan 2011 15:55:50 +0000 (10 09:55 -0600)
treef20b5cc5c65d19a43813057fdb46ffd34bfdc873
parent3e48a2e39243b7d52518d9fef891aabaec5ace89
parentc1c79f84fd04c1b2aacca6c65780a98b72e687fa
Merge branch '3.0/develop' into 3.1/develop
classes/kohana/image.php