rallytime 3b74d123af Merge branch '2015.8' into '2016.3' ... Conflicts: - salt/modules/selinux.py - salt/modules/zypper.py - salt/pillar/__init__.py - salt/states/dockerng.py - tests/runtests.py		2016-02-25 12:36:22 -07:00
..
index.rst	Merge branch '2015.8' into '2016.3'	2016-02-25 12:36:22 -07:00