rallytime 9033060106 Merge branch '2015.8' into '2016.3' ... Conflicts: - salt/states/archive.py		2016-04-28 14:22:58 -06: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-04-28 14:22:58 -06:00