Merge branch 'master' of git://github.com/zendframework/zf2

zendframework · Feb 24, 2011 · 3df55f1 · 3df55f1
2 parents 5aad269 + 3decdc2
commit 3df55f1
Show file tree

Hide file tree

Showing 5,300 changed files with 331,682 additions and 212,085 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2005-2010, Zend Technologies USA, Inc.
+Copyright (c) 2005-2011, Zend Technologies USA, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

diff --git a/bin/classmap_generator.php b/bin/classmap_generator.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

diff --git a/bin/zf.bat b/bin/zf.bat
@@ -12,7 +12,7 @@ REM obtain it through the world-wide-web, please send an email
 REM to license@zend.com so we can send you a copy immediately.
 REM
 REM Zend
-REM Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+REM Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
 REM http://framework.zend.com/license/new-bsd     New BSD License