Colton Myers f00465a8a1 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: doc/topics/event/index.rst salt/loader.py salt/modules/config.py salt/modules/cyg.py salt/modules/hg.py salt/modules/lxc.py salt/modules/upstart.py salt/states/hg.py salt/utils/cloud.py salt/utils/dictupdate.py salt/utils/schedule.py tests/integration/fileserver/gitfs_test.py tests/unit/pydsl_test.py		2015-02-18 11:55:29 -07:00
..
__init__.py	Include the python encoding file header on tests.	2013-11-27 11:19:24 +00:00
ext_modules.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
globals.py	Check that __context__ is always present, since it now is (properly)	2015-02-07 11:59:00 -08:00
loader.py	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-02-18 11:55:29 -07:00