Merge branch 3.2/develop into 3.3/develop

kiall · kiall · commit dc590e1741dd · 2012-01-10T19:13:13.000Z
diff --git a/classes/kohana/auth.php b/classes/kohana/auth.php
@@ -5,7 +5,7 @@
  *
  * @package    Kohana/Auth
  * @author     Kohana Team
- * @copyright  (c) 2007-2010 Kohana Team
+ * @copyright  (c) 2007-2012 Kohana Team
  * @license    http://kohanaframework.org/license
  */
 abstract class Kohana_Auth {
diff --git a/classes/kohana/auth/file.php b/classes/kohana/auth/file.php
@@ -5,7 +5,7 @@
  *
  * @package    Kohana/Auth
  * @author     Kohana Team
- * @copyright  (c) 2007-2010 Kohana Team
+ * @copyright  (c) 2007-2012 Kohana Team
  * @license    http://kohanaframework.org/license
  */
 class Kohana_Auth_File extends Auth {
diff --git a/config/userguide.php b/config/userguide.php
@@ -17,7 +17,7 @@
 			'description' => 'User authentication and authorization.',
 
 			// Copyright message, shown in the footer for this module
-			'copyright' => '&copy; 2008–2011 Kohana Team',
+			'copyright' => '&copy; 2008–2012 Kohana Team',
 		)
 	)
 );

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`* @package Kohana/Auth`
`7`	`7`	`* @author Kohana Team`
`8`		`- * @copyright (c) 2007-2010 Kohana Team`
	`8`	`+ * @copyright (c) 2007-2012 Kohana Team`
`9`	`9`	`* @license http://kohanaframework.org/license`
`10`	`10`	`*/`
`11`	`11`	`abstract class Kohana_Auth {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`'description' => 'User authentication and authorization.',`
`18`	`18`
`19`	`19`	`// Copyright message, shown in the footer for this module`
`20`		`- 'copyright' => '© 2008–2011 Kohana Team',`
	`20`	`+ 'copyright' => '© 2008–2012 Kohana Team',`
`21`	`21`	`)`
`22`	`22`	`)`
`23`	`23`	`);`