moving to new upstream version 0.12.0
Add fileserver update module
Update doc/topics/tutorials/bootstrap_ec2.rst

config file is now copied directly to /etc/salt/minion, not /etc/salt/minion.template

No need for the copy operation.
Replace hardcoded python executable with sys.executable
Merge pull request #3308 from essentialed/develop

Replace hardcoded python executable with sys.executable
Merge pull request #3307 from archtaku/develop

Add missing space to log message
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
SLES grain fix (#3275)

The 'os' grain in SLES 11 SP2 is 'SUSE  Enterprise Server' (two spaces).
Tried to fix this a couple days ago but didn't notice the extra space
after 'SUSE'. See the following:

https://github.com/saltstack/salt/issues/3275#issuecomment-12425372