saltstack/salt — pull request #18960 by rallytime (2014-12-12 18:32:45+00:00)
Title: Backport #18232 to 2014.1

Backport #18232 to 2014.1

Conflicts:
salt/modules/pacman.py