Merge branch '2014.7' into develop

Browse Source

Conflicts:
	salt/runners/manage.py

...

This commit is contained in:

Colton Myers 2014-07-31 15:28:41 -06:00

parent b8b533986a cf0b6dd78e

commit 071569dcf0

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available