Merge branch '3.2/feature/imagick' into 3.2/developv3.2.0-RC1
commitbeaa97924406dfd92bd3f8e5249f49d1a892473b
authorWoody Gilk <woody.gilk@kohanaframework.org>
Thu, 10 Mar 2011 21:09:02 +0000 (10 15:09 -0600)
committerWoody Gilk <woody.gilk@kohanaframework.org>
Thu, 10 Mar 2011 21:09:02 +0000 (10 15:09 -0600)
tree854516b83f4a7274b8dd96af3a28dee3ec1d7550
parentd6e71f51c0b41da30ea6a8e725f4aff0ea4939cd
parentc267c645332c8f42278da3f27524ec441be29a99
Merge branch '3.2/feature/imagick' into 3.2/develop