Merge branch 'feature/zf2-path'
authorMatthew Weier O'Phinney <matthew@zend.com>
Wed, 5 Sep 2012 19:56:13 +0000 (14:56 -0500)
committerMatthew Weier O'Phinney <matthew@zend.com>
Wed, 5 Sep 2012 19:56:13 +0000 (14:56 -0500)

Trivial merge