Colton Myers 25f9b2d2d1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: doc/topics/cloud/action.rst doc/topics/cloud/function.rst doc/topics/reactor/index.rst		2015-04-07 10:05:35 -06:00
..
buildenv	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-03-20 14:39:22 -06:00
installer	Removed dialog box that was used for testing	2015-04-03 00:17:12 +00:00
BuildSalt.bat	Update BuildSalt.bat	2015-04-06 17:52:58 -06:00
portable.py	Fixed problem with pip not working on portable install	2015-04-06 23:04:24 +00:00