From: Evan Coury <me@evancoury.com>
Date: Sat, 19 May 2012 18:03:26 +0000 (-0700)
Subject: Merge remote-tracking branch 'akrabat/hotfix/default-route'
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=67a71337cf0c85e43a58ca257dacdea5dfcc89ce;hp=a0219327cf0d91dfe4de41d5ffca01e9023e189c;p=zf2.biz%2Fgalerie.git

Merge remote-tracking branch 'akrabat/hotfix/default-route'
---

diff --git a/config/application.config.php b/config/application.config.php
index e8868a3..6e62784 100644
--- a/config/application.config.php
+++ b/config/application.config.php
@@ -4,6 +4,9 @@ return array(
         'Application',
     ),
     'module_listener_options' => array( 
+        'config_glob_paths'    => array(
+            'config/autoload/{,*.}{global,local}.php',
+        ),
         'config_cache_enabled' => false,
         'cache_dir'            => 'data/cache',
         'module_paths' => array(