port shorewall to lenny
Merge branch 'stable' of https://github.com/makinacorpus/makina-states into stable
Merge remote-tracking branch 'origin/stable'