<NME> functions.php
<BEF> <?php
/**
 * Zend Framework (http://framework.zend.com/)
 *
 * @link      http://github.com/zendframework/zf2 for the canonical source repository
 * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
 * @license   http://framework.zend.com/license/new-bsd New BSD License
 */

namespace ZendTest\Code\TestAsset;

function foo_bar()
{
}

function bar_foo()
{
}

<MSG> Merging PR zendframework/zf2#5654
Merge branch 'BinaryKitten-2014_date_update' into develop

* BinaryKitten-2014_date_update:
  Updated Test to have correct header
  copyright update for 2014 - LICENSE.txt
  copyright update for 2014 - bin
  copyright update for 2014 - demos
  copyright update for 2014 - Zend Library
  copyright update for 2014 - resources
  copyright update for 2014 - tests

<DFF> @@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 

Merging PR zendframework/zf2#5654 Merge branch 'BinaryKitten-2014_date_update' into develop