Merge branch 'patch-2' of https://github.com/lsmith77/ZendSkeletonApplication into...
authorMatthew Weier O'Phinney <matthew@zend.com>
Wed, 3 Oct 2012 20:22:06 +0000 (15:22 -0500)
committerMatthew Weier O'Phinney <matthew@zend.com>
Wed, 3 Oct 2012 20:22:06 +0000 (15:22 -0500)
commit7ac601e59c0513282bc34dae869c4b3a038e5654
tree36a9d726563cd945b167d5f9a7990a37fcd00eac
parent47c6aa8fda61ae7d7729d58892da35a4bf424401
parent34da29c6d01316ec755f5bc62cd04db6fa78a87e
Merge branch 'patch-2' of https://github.com/lsmith77/ZendSkeletonApplication into hotfix/105

Conflicts:
composer.json