local salting
Merge branch 'master' of github.com:firien/shibboleth