From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Tue, 24 Dec 2013 17:04:45 +0000 (+0100)
Subject: Merge branch 'master' of ateliers.heureux-cyclage.org:lhc/ateliers
X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=commitdiff_plain;h=aea9e28a65a85d9bdaec714338e9b146ab00c9c5

Merge branch 'master' of ateliers.heureux-cyclage.org:lhc/ateliers
---

aea9e28a65a85d9bdaec714338e9b146ab00c9c5
diff --cc etc/gitolite
index 0473794,6f52334..132556f
--- a/etc/gitolite
+++ b/etc/gitolite
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 04737948cf0a1873ecb5183b2ad7a79b5c633045
 -Subproject commit 6f52334daefc9bce6c2e09a5fdafe726f40b6c7b
++Subproject commit 132556f65d436a37502040817318d429d16c2ca7