Merge branch 'master' of ateliers.heureux-cyclage.org:lhc/ateliers
authorLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Tue, 23 Apr 2013 17:45:43 +0000 (19:45 +0200)
committerLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Tue, 23 Apr 2013 17:45:43 +0000 (19:45 +0200)
commitf40b9456a0359223ae8e5c4e2bcd0e6cd6d1ada8
tree86ec3e652583ff5f5cd6967c1d98b164af2a8fee
parenta11ad78672a096632b15a660509d7dd5f7c5eae5
parente1cc752f3822c71e21d2efaf53810bf892df7499
Merge branch 'master' of ateliers.heureux-cyclage.org:lhc/ateliers

Conflicts:
etc/cron.d/mysql-backup