Merge branch 3.1/develop into 3.2/develop

kiall · kiall · commit 7c4baf178f00 · 2012-01-10T19:12:02.000Z
diff --git a/config/userguide.php b/config/userguide.php
@@ -25,7 +25,7 @@
 			'description' => 'Documentation viewer and api generation.',
 			
 			// 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
`@@ -25,7 +25,7 @@`
`25`	`25`	`'description' => 'Documentation viewer and api generation.',`
`26`	`26`
`27`	`27`	`// Copyright message, shown in the footer for this module`
`28`		`- 'copyright' => '© 2008–2011 Kohana Team',`
	`28`	`+ 'copyright' => '© 2008–2012 Kohana Team',`
`29`	`29`	`)`
`30`	`30`	`)`
`31`	`31`	`);`