saltstack/salt — pull request #18883 by rallytime (2014-12-10 17:11:20+00:00)
Title: Backport #18274 to 2014.1

Backport #18274 to 2014.1

Conflicts:
salt/modules/freebsdpkg.py