rallytime d743f8cc4e Merge branch '2015.5' into '2015.8' ... Conflicts: - salt/client/ssh/__init__.py - salt/modules/aptpkg.py - salt/modules/zypper.py - salt/states/pkgrepo.py		2016-03-30 13:38:38 -06:00
..
buildenv	Remove trailing white spaces in files under pkg/ dir	2016-03-01 17:37:18 +02:00
installer	Merge branch '2015.5' into '2015.8'	2016-03-30 13:38:38 -06:00
BuildSalt.bat	Fix remove placeholder files	2016-02-08 17:51:36 -07:00
portable.py	Fixed problem with pip not working on portable install	2015-04-06 23:04:24 +00:00