Merge remote branch 'joel/3287-patch' into 3.0.x

kohana · Sep 30, 2010 · edc5808 · edc5808
2 parents 343269f + 266c9a4
commit edc5808
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/classes/kohana/auth.php b/classes/kohana/auth.php
@@ -5,8 +5,8 @@
  *
  * @package    Kohana/Auth
  * @author     Kohana Team
- * @copyright  (c) 2007-2009 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2010 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,8 +5,8 @@
  *
  * @package    Kohana/Auth
  * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2010 Kohana Team
+ * @license    http://kohanaframework.org/license
  */
 class Kohana_Auth_File extends Auth {
 

diff --git a/classes/kohana/auth/orm.php b/classes/kohana/auth/orm.php
@@ -4,8 +4,8 @@
  *
  * @package    Kohana/Auth
  * @author     Kohana Team
- * @copyright  (c) 2007-2008 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2010 Kohana Team
+ * @license    http://kohanaframework.org/license
  */
 class Kohana_Auth_ORM extends Auth {
 

diff --git a/classes/model/auth/role.php b/classes/model/auth/role.php
@@ -4,8 +4,8 @@
  *
  * @package    Kohana/Auth
  * @author     Kohana Team
- * @copyright  (c) 2007-2009 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2010 Kohana Team
+ * @license    http://kohanaframework.org/license
  */
 class Model_Auth_Role extends ORM {
 

diff --git a/classes/model/auth/user.php b/classes/model/auth/user.php
@@ -4,8 +4,8 @@
  *
  * @package    Kohana/Auth
  * @author     Kohana Team
- * @copyright  (c) 2007-2009 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2010 Kohana Team
+ * @license    http://kohanaframework.org/license
  */
 class Model_Auth_User extends ORM {
 

diff --git a/classes/model/auth/user/token.php b/classes/model/auth/user/token.php
@@ -4,8 +4,8 @@
  *
  * @package    Kohana/Auth
  * @author     Kohana Team
- * @copyright  (c) 2007-2009 Kohana Team
- * @license    http://kohanaphp.com/license.html
+ * @copyright  (c) 2007-2010 Kohana Team
+ * @license    http://kohanaframework.org/license
  */
 class Model_Auth_User_Token extends ORM {