rallytime 4baea26c58 Merge branch '2015.8' into '2016.3' ... Conflicts: - doc/topics/netapi/index.rst - salt/modules/win_servermanager.py - salt/modules/zypper.py		2016-02-20 12:27:41 -07:00
..
index.rst	Merge branch '2015.8' into '2016.3'	2016-02-20 12:27:41 -07:00
writing.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00