Merge branch 'feature/di' of github.com:ralphschindler/zf2 into featu…

…re/rackspace
zendframework · May 31, 2011 · 16367cd · 16367cd
11 parents d21f055 + 5b18029 + e6b97af + 010fb36 + 64c7b8d + edaa760 + c4c0c95 + 636523e + 4cc2cd6 + 290ea90 + 9f4ca1b
commit 16367cd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/PriorityQueue.php b/src/PriorityQueue.php
@@ -14,7 +14,7 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @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
  */
 
@@ -41,7 +41,7 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @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
  */
 class PriorityQueue implements Countable, IteratorAggregate, Serializable

diff --git a/test/PriorityQueueTest.php b/test/PriorityQueueTest.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Stdlib
  * @subpackage UnitTests
- * @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
  */
 
@@ -29,7 +29,7 @@
  * @package    Zend_Stdlib
  * @subpackage UnitTests
  * @group      Zend_Stdlib
- * @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
  */
 class PriorityQueueTest extends \PHPUnit_Framework_TestCase