saltstack/salt — pull request #18809 by rallytime (2014-12-08 20:14:53+00:00)
Title: Backport #18169 to 2014.1

Backport #18169 to 2014.1

Conflicts:
salt/modules/timezone.py