Merge branch '3.0.x' of github.com:kohana/kohana into 3.0.x
commit79ee6be20c62dc82c1a0c4bae0025e1fd17d2f11
authorWoody Gilk <woody.gilk@kohanaframework.org>
Wed, 22 Sep 2010 03:34:05 +0000 (21 22:34 -0500)
committerWoody Gilk <woody.gilk@kohanaframework.org>
Wed, 22 Sep 2010 03:34:05 +0000 (21 22:34 -0500)
treef9902e213c832f8cabb15762006dd5015a58a2f9
parentb2701d342f3b9afdc700cf5a9ae8c11d8c41b2d8
parenta869c2d7d762aa23ab628faf083148c66be5220b
Merge branch '3.0.x' of github.com:kohana/kohana into 3.0.x