Colton Myers f6eae029f0 Merge branch '2014.7' into merge-forward-2015.2 ... Conflicts: pkg/windows/installer/Salt-Minion-Setup.nsi salt/grains/core.py salt/minion.py salt/modules/mongodb.py salt/states/archive.py salt/states/mount.py salt/utils/master.py salt/utils/schedule.py salt/utils/thin.py tests/jenkins-ng.py		2015-01-06 13:14:27 -07:00
..
buildenv	Merge branch '2014.7' into develop	2014-11-27 03:59:40 +00:00
installer	Merge branch '2014.7' into merge-forward-2015.2	2015-01-06 13:14:27 -07:00