From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Tue, 23 Apr 2013 17:45:43 +0000 (+0200)
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=f40b9456a0359223ae8e5c4e2bcd0e6cd6d1ada8

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

Conflicts:
	etc/cron.d/mysql-backup
---

f40b9456a0359223ae8e5c4e2bcd0e6cd6d1ada8