<NME> functions.php
<BEF> <?php

namespace ZendTest\Code\TestAsset;

function foo_bar()
{
}

function bar_foo()
{
}

<MSG> Merge pull request zendframework/zf2#4978 from samsonasik/add/missing.docblock

added missing docblock for "@link", "@copyright", and "@license" and fix wrong namespace according PSR-0

Conflicts:
	library/Zend/Db/TableGateway/Feature/StatementOptionsFeature.php

<DFF> @@ -1,4 +1,11 @@
 <?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;
 

Merge pull request zendframework/zf2#4978 from samsonasik/add/missing.docblock