Merge branch '3.0/feature/imagick' into 3.2/feature/imagick
commitc267c645332c8f42278da3f27524ec441be29a99
authorWoody Gilk <woody.gilk@kohanaframework.org>
Thu, 10 Mar 2011 21:08:45 +0000 (10 15:08 -0600)
committerWoody Gilk <woody.gilk@kohanaframework.org>
Thu, 10 Mar 2011 21:08:45 +0000 (10 15:08 -0600)
tree854516b83f4a7274b8dd96af3a28dee3ec1d7550
parentd6e71f51c0b41da30ea6a8e725f4aff0ea4939cd
parent8fc3f99e78116fbd7df9244af2ed9ef9c3a414ec
Merge branch '3.0/feature/imagick' into 3.2/feature/imagick