Merge branch 'master' of https://github.com/x3ak/ZendSkeletonApplication into hotfix/123
authorMatthew Weier O'Phinney <matthew@zend.com>
Wed, 3 Oct 2012 20:43:22 +0000 (15:43 -0500)
committerMatthew Weier O'Phinney <matthew@zend.com>
Wed, 3 Oct 2012 20:43:22 +0000 (15:43 -0500)

Trivial merge