saltstack/salt — pull request #18857 by rallytime (2014-12-09 21:14:47+00:00)
Title: Backport #18234 to 2014.1

Backport #18234 to 2014.1

Conflicts:
salt/modules/pkgin.py