Colton Myers 32f5345d7d Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 ... Conflicts: conf/minion doc/conf.py salt/modules/file.py		2015-08-10 10:56:40 -06:00
..
saltstack	Merge branch '2014.7' into mergeforward	2014-10-30 17:42:36 -06:00
saltstack2	master_finger configuration docs	2015-08-06 20:23:22 -06:00