saltstack/salt — pull request #18995 by rallytime (2014-12-15 18:18:47+00:00)
Title: Backport #18988 to 2014.1

Backport #18988 to 2014.1

Conflicts:
salt/modules/zypper.py