debugging
Merge branch 'master' of github.com:wuxxin/salt-shared