From: Matthew Weier O'Phinney Date: Wed, 3 Oct 2012 20:22:06 +0000 (-0500) Subject: Merge branch 'patch-2' of https://github.com/lsmith77/ZendSkeletonApplication into... X-Git-Url: http://git.inspyration.org/?p=zf2.biz%2Fapplication_blanche.git;a=commitdiff_plain;h=7ac601e59c0513282bc34dae869c4b3a038e5654 Merge branch 'patch-2' of https://github.com/lsmith77/ZendSkeletonApplication into hotfix/105 Conflicts: composer.json --- 7ac601e59c0513282bc34dae869c4b3a038e5654