saltstack/salt — pull request #19184 by rallytime (2014-12-22 19:28:17+00:00)
Title: Backport #18486 to 2014.1

Backport #18486 to 2014.1

Conflicts:
salt/modules/parted.py