Merge branch 'master' into talmdal_dev

Conflicts:
	modules/gallery/controllers/albums.php
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php

1 files changed, 0 insertions, 58 deletions

diff --git a/system/core/Bootstrap.php b/system/core/Bootstrap.php
deleted file mode 100644
index edfb086d..00000000
--- a/system/core/Bootstrap.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php defined('SYSPATH') OR die('No direct access allowed.');
-/**
- * Kohana process control file, loaded by the front controller.
- * 
- * $Id: Bootstrap.php 4135 2009-03-28 17:51:04Z zombor $
- *
- * @package    Core
- * @author     Kohana Team
- * @copyright  (c) 2007 Kohana Team
- * @license    http://kohanaphp.com/license.html
- */
-
-define('KOHANA_VERSION',  '2.3.3');
-define('KOHANA_CODENAME', 'aegolius');
-
-// Test of Kohana is running in Windows
-define('KOHANA_IS_WIN', DIRECTORY_SEPARATOR === '\\');
-
-// Kohana benchmarks are prefixed to prevent collisions
-define('SYSTEM_BENCHMARK', 'system_benchmark');
-
-// Load benchmarking support
-require SYSPATH.'core/Benchmark'.EXT;
-
-// Start total_execution
-Benchmark::start(SYSTEM_BENCHMARK.'_total_execution');
-
-// Start kohana_loading
-Benchmark::start(SYSTEM_BENCHMARK.'_kohana_loading');
-
-// Load core files
-require SYSPATH.'core/utf8'.EXT;
-require SYSPATH.'core/Event'.EXT;
-require SYSPATH.'core/Kohana'.EXT;
-
-// Prepare the environment
-Kohana::setup();
-
-// End kohana_loading
-Benchmark::stop(SYSTEM_BENCHMARK.'_kohana_loading');
-
-// Start system_initialization
-Benchmark::start(SYSTEM_BENCHMARK.'_system_initialization');
-
-// Prepare the system
-Event::run('system.ready');
-
-// Determine routing
-Event::run('system.routing');
-
-// End system_initialization
-Benchmark::stop(SYSTEM_BENCHMARK.'_system_initialization');
-
-// Make the magic happen!
-Event::run('system.execute');
-
-// Clean up and exit
-Event::run('system.shutdown');
\ No newline at end of file