From bca2b58e416c9fb1d01aa55f9165d7f3151657bb Mon Sep 17 00:00:00 2001
From: gmorel <gmorel@openstudio.fr>
Date: Mon, 16 Sep 2013 15:07:58 +0200
Subject: [PATCH] Merge master

---
 local/modules/Colissimo/Colissimo.php                    | 0
 local/modules/Colissimo/Config/config.xml                | 0
 local/modules/Colissimo/Config/plugin.xml                | 0
 local/modules/Colissimo/Config/schema.xml                | 0
 local/modules/DebugBar/Config/config.xml                 | 0
 local/modules/DebugBar/Config/plugin.xml                 | 0
 local/modules/DebugBar/Config/schema.xml                 | 0
 local/modules/DebugBar/DataCollector/PropelCollector.php | 0
 local/modules/DebugBar/DebugBar.php                      | 0
 local/modules/DebugBar/Listeners/DebugBarListeners.php   | 0
 local/modules/DebugBar/Smarty/Plugin/DebugBar.php        | 0
 11 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 local/modules/Colissimo/Colissimo.php
 mode change 100644 => 100755 local/modules/Colissimo/Config/config.xml
 mode change 100644 => 100755 local/modules/Colissimo/Config/plugin.xml
 mode change 100644 => 100755 local/modules/Colissimo/Config/schema.xml
 mode change 100644 => 100755 local/modules/DebugBar/Config/config.xml
 mode change 100644 => 100755 local/modules/DebugBar/Config/plugin.xml
 mode change 100644 => 100755 local/modules/DebugBar/Config/schema.xml
 mode change 100644 => 100755 local/modules/DebugBar/DataCollector/PropelCollector.php
 mode change 100644 => 100755 local/modules/DebugBar/DebugBar.php
 mode change 100644 => 100755 local/modules/DebugBar/Listeners/DebugBarListeners.php
 mode change 100644 => 100755 local/modules/DebugBar/Smarty/Plugin/DebugBar.php

diff --git a/local/modules/Colissimo/Colissimo.php b/local/modules/Colissimo/Colissimo.php
old mode 100644
new mode 100755
diff --git a/local/modules/Colissimo/Config/config.xml b/local/modules/Colissimo/Config/config.xml
old mode 100644
new mode 100755
diff --git a/local/modules/Colissimo/Config/plugin.xml b/local/modules/Colissimo/Config/plugin.xml
old mode 100644
new mode 100755
diff --git a/local/modules/Colissimo/Config/schema.xml b/local/modules/Colissimo/Config/schema.xml
old mode 100644
new mode 100755
diff --git a/local/modules/DebugBar/Config/config.xml b/local/modules/DebugBar/Config/config.xml
old mode 100644
new mode 100755
diff --git a/local/modules/DebugBar/Config/plugin.xml b/local/modules/DebugBar/Config/plugin.xml
old mode 100644
new mode 100755
diff --git a/local/modules/DebugBar/Config/schema.xml b/local/modules/DebugBar/Config/schema.xml
old mode 100644
new mode 100755
diff --git a/local/modules/DebugBar/DataCollector/PropelCollector.php b/local/modules/DebugBar/DataCollector/PropelCollector.php
old mode 100644
new mode 100755
diff --git a/local/modules/DebugBar/DebugBar.php b/local/modules/DebugBar/DebugBar.php
old mode 100644
new mode 100755
diff --git a/local/modules/DebugBar/Listeners/DebugBarListeners.php b/local/modules/DebugBar/Listeners/DebugBarListeners.php
old mode 100644
new mode 100755
diff --git a/local/modules/DebugBar/Smarty/Plugin/DebugBar.php b/local/modules/DebugBar/Smarty/Plugin/DebugBar.php
old mode 100644
new mode 100755