rallytime 308aa5fd61 Merge branch '2016.3' into 'develop' ... Conflicts: - conf/master - conf/minion - doc/ref/proxy/all/index.rst - salt/cli/daemons.py - salt/modules/key.py - salt/modules/reg.py - salt/modules/win_pkg.py - salt/utils/__init__.py - salt/utils/cloud.py - tests/unit/daemons_test.py		2016-03-18 10:57:15 -06:00
..
index.rst	Merge branch '2016.3' into 'develop'	2016-03-18 10:57:15 -06:00