Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2

Browse Source

Conflicts:
	salt/modules/groupadd.py

...

This commit is contained in:

Colton Myers 2015-01-08 11:44:55 -07:00

parent 00a5b8b341 090bad4089

commit f5d3a61c86

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