Merge branch '3.1.x' of github.com:kohana/kohana into 3.1.x

application/bootstrap.php

@@ -36,6 +36,15 @@ ini_set('unserialize_callback_func', 'spl_autoload_call');
 
 //-- Configuration and initialization -----------------------------------------
 
+/**
+ * Set Kohana::$environment if $_ENV['KOHANA_ENV'] has been supplied.
+ * 
+ */
+if (isset($_ENV['KOHANA_ENV']))
+{
+	Kohana::$environment = $_ENV['KOHANA_ENV'];
+}
+
 /**
  * Initialize Kohana, setting the default options.
  *