merged skunkworks into develop.

2012-01-16 13:59:24 -06:00
parent 610d8827c4
commit b5442c67fc
117 changed files with 7268 additions and 3999 deletions
--- a/application/language/en/pagination.php
+++ b/application/language/en/pagination.php
@@ -8,8 +8,8 @@ return array(
 	|--------------------------------------------------------------------------
 	|
 	| The following language lines are used by the paginator library to build
-	| the pagination links. They may be easily changed by the developer to
-	| anything they wish.
+	| the pagination links. You're free to change them to anything you want.
+	| If you come up with something more exciting, let us know.
 	|
 	*/