[salt: 2/4] Merge branch 'master' of ssh://pkgs.fedoraproject.org/salt

[Erik Johnson]

commit a0bf4b63142a6e42e44a5fd102ab1b8f507773d0
Merge: c886b7c bc1d2bd
Author: Erik Johnson <erik at saltstack.com>
Date:   Mon May 5 23:49:33 2014 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/salt

 .gitignore         |    2 --
 fix-setup-py.patch |   13 +++++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)
---