<NME> FooTrait.php
<BEF> ADDFILE
<MSG> Merge branch 'develop' of github.com:zendframework/zf2 into develop

<DFF> @@ -0,0 +1,19 @@
+<?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;
+
+trait FooTrait
+{
+    use BarTrait;
+
+    public function fooBarBaz()
+    {
+    }
+}

Merge branch 'develop' of github.com:zendframework/zf2 into develop