Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop

19 files changed, 19 insertions, 19 deletions

diff --git a/application/config/autoload.php b/application/config/autoload.php
index 5326f1c96..a45567b22 100644
--- a/application/config/autoload.php
+++ b/application/config/autoload.php
@@ -8,7 +8,7 @@
  * 
  * Licensed under the Academic Free License version 3.0
  * 
- * This source file is subject to the Open Software License (OSL 3.0) that is
+ * This source file is subject to the Academic Free License (AFL 3.0) that is
  * bundled with this package in the files license_afl.txt / license_afl.rst.
  * It is also available through the world wide web at this URL:
  * http://opensource.org/licenses/AFL-3.0
diff --git a/application/config/config.php b/application/config/config.php
index de1edac54..808cc33bd 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -8,7 +8,7 @@
  * 
  * Licensed under the Academic Free License version 3.0
  * 
- * This source file is subject to the Open Software License (OSL 3.0) that is
+ * This source file is subject to the Academic Free License (AFL 3.0) that is
  * bundled with this package in the files license_afl.txt / license_afl.rst.
  * It is also available through the world wide web at this URL:
  * http://opensource.org/licenses/AFL-3.0
diff --git a/application/config/constants.php b/application/config/constants.php
index 0bff971bb..3b79a0363 100644
--- a/application/config/constants.php
+++ b/application/config/constants.php
@@ -8,7 +8,7 @@
  * 
  * Licensed under the Academic Free License version 3.0
  * 
- * This source file is subject to the Open Software License (OSL 3.0) that is
+ * This source file is subject to the Academic Free License (AFL 3.0) that is
  * bundled with this package in the files license_afl.txt / license_afl.rst.
  * It is also available through the world wide web at this URL:
  * http://opensource.org/licenses/AFL-3.0
diff --git a/application/config/database.php b/application/config/database.php
index c2761bc85..28b792f75 100644
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -8,7 +8,7 @@
  * 
  * Licensed under the Academic Free License version 3.0
  * 
- * This source file is subject to the Open Software License (OSL 3.0) that is
+ * This source file is subject to the Academic Free License (AFL 3.0) that is
  * bundled with this package in the files license_afl.txt / license_afl.rst.
  * It is also available through the world wide web at this URL:
  * http://opensource.org/licenses/AFL-3.0
diff --git a/application/config/doctypes.php b/application/config/doctypes.php
index 9f9db93f8..48ccc053d 100644
--- a/application/config/doctypes.php
+++ b/application/config/doctypes.php
@@ -8,7 +8,7 @@
  * 
  * Licensed under the Academic Free License version 3.0
  * 
- * This source file is subject to the Open Software License (OSL 3.0) that is
+ * This source file is subject to the Academic Free License (AFL 3.0) that is
  * bundled with this package in the files license_afl.txt / license_afl.rst.
  * It is also available through the world wide web at this URL:
  * http://opensource.org/licenses/AFL-3.0
diff --git a/application/config/foreign_chars.php b/application/config/foreign_chars.php
index 66aeb2447..691762338 100644
--- a/application/config/foreign_chars.php
+++ b/application/config/foreign_chars.php
@@ -8,7 +8,7 @@
  * 
  * Licensed under the Academic Free License version 3.0
  * 
- * This source file is subject to the Open Software License (OSL 3.0) that is
+ * This source file is subject to the Academic Free License (AFL 3.0) that is
  * bundled with this package in the files license_afl.txt / license_afl.rst.
  * It is also available through the world wide web at this URL:
  * http://opensource.org/licenses/AFL-3.0
diff --git a/application/config/hooks.php b/application/config/hooks.php
index b5c253677..000ae514c 100644
--- a/application/config/hooks.php
+++ b/application/config/hooks.php
@@ -8,7 +8,7 @@
  * 
  * Licensed under the Academic Free License version 3.0
  * 
- * This source file is subject to the Open Software License (OSL 3.0) that is
+ * This source file is subject to the Academic Free License (AFL 3.0) that is
  * bundled with this package in the files license_afl.txt / license_afl.rst.
  * It is also available through the world wide web at this URL:
  * http://opensource.org/licenses/AFL-3.0
diff --git a/application/config/migration.php b/application/config/migration.php
index 150d414d9..187a499ec 100644
--- a/application/config/migration.php
+++ b/application/config/migration.php
@@ -8,7 +8,7 @@
  * 
  * Licensed under the Academic Free License version 3.0
  * 
- * This source file is subject to the Open Software License (OSL 3.0) that is
+ * This source file is subject to the Academic Free License (AFL 3.0) that is
  * bundled with this package in the files license_afl.txt / license_afl.rst.
  * It is also available through the world wide web at this URL:
  * http://opensource.org/licenses/AFL-3.0
diff --git a/application/config/mimes.php b/application/config/mimes.php
index 8d348757f..ea0192574 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -8,7 +8,7 @@
  * 
  * Licensed under the Academic Free License version 3.0
  * 
- * This source file is subject to the Open Software License (OSL 3.0) that is
+ * This source file is subject to the Academic Free License (AFL 3.0) that is
  * bundled with this package in the files license_afl.txt / license_afl.rst.
  * It is also available through the world wide web at this URL:
  * http://opensource.org/licenses/AFL-3.0
diff --git a/application/config/profiler.php b/application/config/profiler.php
index 7727283e0..b0bd2cd1f 100644
--- a/application/config/profiler.php
+++ b/application/config/profiler.php
@@ -8,7 +8,7 @@
  * 
  * Licensed under the Academic Free License version 3.0
  * 
- * This source file is subject to the Open Software License (OSL 3.0) that is
+ * This source file is subject to the Academic Free License (AFL 3.0) that is
  * bundled with this package in the files license_afl.txt / license_afl.rst.
  * It is also available through the world wide web at this URL:
  * http://opensource.org/licenses/AFL-3.0
diff --git a/application/config/routes.php b/application/config/routes.php
index 28cc6ca30..b7f4056a5 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -8,7 +8,7 @@
  * 
  * Licensed under the Academic Free License version 3.0
  * 
- * This source file is subject to the Open Software License (OSL 3.0) that is
+ * This source file is subject to the Academic Free License (AFL 3.0) that is
  * bundled with this package in the files license_afl.txt / license_afl.rst.
  * It is also available through the world wide web at this URL:
  * http://opensource.org/licenses/AFL-3.0
diff --git a/application/config/smileys.php b/application/config/smileys.php
index d444a3601..ada329aa1 100644
--- a/application/config/smileys.php
+++ b/application/config/smileys.php
@@ -8,7 +8,7 @@
  * 
  * Licensed under the Academic Free License version 3.0
  * 
- * This source file is subject to the Open Software License (OSL 3.0) that is
+ * This source file is subject to the Academic Free License (AFL 3.0) that is
  * bundled with this package in the files license_afl.txt / license_afl.rst.
  * It is also available through the world wide web at this URL:
  * http://opensource.org/licenses/AFL-3.0
diff --git a/application/config/user_agents.php b/application/config/user_agents.php
index 393833b22..cddb01da9 100644
--- a/application/config/user_agents.php
+++ b/application/config/user_agents.php
@@ -8,7 +8,7 @@
  * 
  * Licensed under the Academic Free License version 3.0
  * 
- * This source file is subject to the Open Software License (OSL 3.0) that is
+ * This source file is subject to the Academic Free License (AFL 3.0) that is
  * bundled with this package in the files license_afl.txt / license_afl.rst.
  * It is also available through the world wide web at this URL:
  * http://opensource.org/licenses/AFL-3.0
diff --git a/application/controllers/welcome.php b/application/controllers/welcome.php
index edf35fa1f..0757f2d79 100644
--- a/application/controllers/welcome.php
+++ b/application/controllers/welcome.php
@@ -8,7 +8,7 @@
  * 
  * Licensed under the Academic Free License version 3.0
  * 
- * This source file is subject to the Open Software License (OSL 3.0) that is
+ * This source file is subject to the Academic Free License (AFL 3.0) that is
  * bundled with this package in the files license_afl.txt / license_afl.rst.
  * It is also available through the world wide web at this URL:
  * http://opensource.org/licenses/AFL-3.0
diff --git a/application/errors/error_404.php b/application/errors/error_404.php
index 6a34cae72..eb98deb71 100644
--- a/application/errors/error_404.php
+++ b/application/errors/error_404.php
@@ -8,7 +8,7 @@
  * 
  * Licensed under the Academic Free License version 3.0
  * 
- * This source file is subject to the Open Software License (OSL 3.0) that is
+ * This source file is subject to the Academic Free License (AFL 3.0) that is
  * bundled with this package in the files license_afl.txt / license_afl.rst.
  * It is also available through the world wide web at this URL:
  * http://opensource.org/licenses/AFL-3.0
diff --git a/application/errors/error_db.php b/application/errors/error_db.php
index 3aa15f532..a53c38992 100644
--- a/application/errors/error_db.php
+++ b/application/errors/error_db.php
@@ -8,7 +8,7 @@
  * 
  * Licensed under the Academic Free License version 3.0
  * 
- * This source file is subject to the Open Software License (OSL 3.0) that is
+ * This source file is subject to the Academic Free License (AFL 3.0) that is
  * bundled with this package in the files license_afl.txt / license_afl.rst.
  * It is also available through the world wide web at this URL:
  * http://opensource.org/licenses/AFL-3.0
diff --git a/application/errors/error_general.php b/application/errors/error_general.php
index a0509c6bf..7d9a29f4e 100644
--- a/application/errors/error_general.php
+++ b/application/errors/error_general.php
@@ -8,7 +8,7 @@
  * 
  * Licensed under the Academic Free License version 3.0
  * 
- * This source file is subject to the Open Software License (OSL 3.0) that is
+ * This source file is subject to the Academic Free License (AFL 3.0) that is
  * bundled with this package in the files license_afl.txt / license_afl.rst.
  * It is also available through the world wide web at this URL:
  * http://opensource.org/licenses/AFL-3.0
diff --git a/application/errors/error_php.php b/application/errors/error_php.php
index 4a8c9a8ce..ec2a3f10a 100644
--- a/application/errors/error_php.php
+++ b/application/errors/error_php.php
@@ -8,7 +8,7 @@
  * 
  * Licensed under the Academic Free License version 3.0
  * 
- * This source file is subject to the Open Software License (OSL 3.0) that is
+ * This source file is subject to the Academic Free License (AFL 3.0) that is
  * bundled with this package in the files license_afl.txt / license_afl.rst.
  * It is also available through the world wide web at this URL:
  * http://opensource.org/licenses/AFL-3.0
diff --git a/application/views/welcome_message.php b/application/views/welcome_message.php
index b4cf9b432..709045392 100644
--- a/application/views/welcome_message.php
+++ b/application/views/welcome_message.php
@@ -8,7 +8,7 @@
  * 
  * Licensed under the Academic Free License version 3.0
  * 
- * This source file is subject to the Open Software License (OSL 3.0) that is
+ * This source file is subject to the Academic Free License (AFL 3.0) that is
  * bundled with this package in the files license_afl.txt / license_afl.rst.
  * It is also available through the world wide web at this URL:
  * http://opensource.org/licenses/AFL-3.0