From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Wed, 3 Oct 2012 20:54:50 +0000 (-0500)
Subject: Merge branch 'hotfix/132'
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=e619d80e4c160f5ddfd6d1845d5861f3854eb581;hp=f87fbac1a907800df169dae3ddc2445f8a618e08;p=zf2.biz%2Fapplication_blanche.git

Merge branch 'hotfix/132'

Close #132
Close #110
---