saltstack/salt — pull request #18997 by rallytime (2014-12-15 19:06:03+00:00)
Title: Backport #18346 to 2014.1

Backport #18346 to 2014.1

Conflicts:
salt/modules/rvm.py