moving to new upstream version 0.12.0
Merge branch 'develop' of git://github.com/saltstack/salt into develop
fixup salt.spec for 0.12.0
Merge pull request #3309 from herlo/develop

New 0.12.0 spec file