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.
Add missing space to log message

When testing a new virtualenv installation today, I noticed the
following log message:

[INFO    ] Authentication failed from host foo, the key is in pending
and needs to be accepted with salt-key-a foo

This commit adds a space between "salt-key" and "-a".
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