saltstack/salt — pull request #18986 by rallytime (2014-12-15 01:56:37+00:00)
Title: Backport #18153 to 2014.1

Backport #18153 to 2014.1

Conflicts:
salt/modules/zypper.py