Merge branch '3.1/develop' into 3.2/develop
commitd324eed8f16d2fbed34ec22893195df74b873778
authorWoody Gilk <woody.gilk@kohanaframework.org>
Mon, 9 Jan 2012 03:02:47 +0000 (8 21:02 -0600)
committerWoody Gilk <woody.gilk@kohanaframework.org>
Mon, 9 Jan 2012 03:02:47 +0000 (8 21:02 -0600)
tree4d37815e315e787f2948143c80a484a2a5bd215f
parentc68463eff1ce20af1fc9e98c839bf6e3d1e1b3e1
parenta8885520a7c13455d1c0fbc56b30e0c128547559
Merge branch '3.1/develop' into 3.2/develop
classes/kohana/image/gd.php