Colton Myers 667dfcee14 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: salt/renderers/gpg.py tests/integration/loader/loader.py		2015-08-21 16:44:59 -06:00
..
index.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-08-21 16:44:59 -06:00