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

Trivial merge