rallytime cc83fa151a Merge branch '2016.3' into 'develop' ... Conflicts: - salt/modules/status.py - salt/utils/__init__.py - tests/unit/modules/boto_vpc_test.py - tests/unit/modules/mount_test.py - tests/unit/states/boto_vpc_test.py		2016-06-28 17:34:27 -06:00
..
handlers	Whitespace cleanup	2014-12-11 07:53:20 -08:00
index.rst	Merge branch '2016.3' into 'develop'	2016-06-28 17:34:27 -06:00