Merge branch 3.1/develop into 3.2/develop

kohana · Jan 10, 2012 · f077aa8 · f077aa8
2 parents d324eed + 47412f2
commit f077aa8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/classes/kohana/image/imagick.php b/classes/kohana/image/imagick.php
@@ -5,7 +5,7 @@
  * @package    Kohana/Image
  * @category   Drivers
  * @author     Tamas Mihalik tamas.mihalik@gmail.com
- * @copyright  (c) 2009-2010 Kohana Team
+ * @copyright  (c) 2009-2012 Kohana Team
  * @license    http://kohanaphp.com/license.html
  */
 class Kohana_Image_Imagick extends Image {

diff --git a/config/userguide.php b/config/userguide.php
@@ -17,7 +17,7 @@
 			'description' => 'Image manipulation.',
 
 			// Copyright message, shown in the footer for this module
-			'copyright' => '&copy; 2008–2010 Kohana Team',
+			'copyright' => '&copy; 2008–2012 Kohana Team',
 		)	
 	)
 );
diff --git a/tests/kohana/ImageTest.php b/tests/kohana/ImageTest.php
@@ -6,7 +6,7 @@
  * @group      kohana.image
  * @category   Test
  * @author     Kohana Team
- * @copyright  (c) 2009-2011 Kohana Team
+ * @copyright  (c) 2009-2012 Kohana Team
  * @license    http://http://kohanaframework.org/license
  */