Merging in 3.1.x
commit0d6ff50c1467146caa0b08b1c1720c6de2c9d605
authorMatt Button <matthew@sigswitch.com>
Tue, 21 Dec 2010 19:58:58 +0000 (21 19:58 +0000)
committerMatt Button <matthew@sigswitch.com>
Tue, 21 Dec 2010 19:58:58 +0000 (21 19:58 +0000)
treeb8c5aebc4fd79d32721a0abda2002f218b0486aa
parent954d12a8187d5cea5115aef3ecebd23224b6eed6
parent3ee592fdd6222fd3616b364fdfa1529679a3e8f2
Merging in 3.1.x
classes/kohana/config.php
classes/kohana/config/file.php
classes/kohana/config/reader.php
classes/kohana/core.php
tests/kohana/ConfigTest.php