From: Evan Coury Date: Thu, 9 Feb 2012 20:20:27 +0000 (-0700) Subject: Merge remote-tracking branch 'ocramius/mvc-router-from-locator' X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=90a65ccba7287c8a83a4abfe9c3d3393797519cc;p=zf2.biz%2Fgalerie.git Merge remote-tracking branch 'ocramius/mvc-router-from-locator' --- 90a65ccba7287c8a83a4abfe9c3d3393797519cc