rallytime 031a75ca33 Merge branch '2015.8' into '2016.3' ... Conflicts: - Contributing.rst - conf/master - doc/index.rst - doc/man/salt.7 - pkg/suse/README.suse - salt/client/ssh/state.py - salt/minion.py - salt/modules/zypper.py - salt/utils/schedule.py - tests/unit/modules/zypper_test.py		2016-03-02 10:26:13 -07:00
..
saltstack	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
saltstack2	Merge branch '2015.8' into '2016.3'	2016-03-02 10:26:13 -07:00