oups, switch
Merge branch 'master' of https://github.com/makinacorpus/makina-states
Merge remote-tracking branch 'origin/stable'
Merge remote-tracking branch 'origin/stable'
add ftp hooks