Colton Myers 7fc1cc2ba2 Merge branch '2014.7' into merge-forward ... Conflicts: doc/topics/releases/2014.7.1.rst salt/modules/mdadm.py salt/modules/mine.py salt/modules/win_firewall.py salt/modules/win_groupadd.py salt/modules/win_service.py salt/modules/win_system.py salt/modules/win_useradd.py salt/runners/jobs.py tests/unit/modules/mdadm_test.py		2014-12-22 13:33:53 -07:00
..
arch.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
debian.rst	Comma cleanup	2014-12-12 11:40:10 -08:00
fedora.rst	Trailing whitespace cleanup	2014-12-11 07:53:19 -08:00
freebsd.rst	Comma cleanup	2014-12-12 11:40:10 -08:00
gentoo.rst	Trailing whitespace cleanup	2014-12-11 07:53:19 -08:00
index.rst	Trailing whitespace cleanup	2014-12-11 07:53:19 -08:00
osx.rst	Trailing whitespace cleanup	2014-12-11 07:53:19 -08:00
rhel.rst	Trailing whitespace cleanup	2014-12-11 07:53:19 -08:00
solaris.rst	Trailing whitespace cleanup	2014-12-11 07:53:19 -08:00
suse.rst	Trailing whitespace cleanup	2014-12-11 07:53:19 -08:00
ubuntu.rst	Merge branch '2014.7' into merge-forward	2014-12-16 14:45:25 -07:00
windows.rst	Merge branch '2014.7' into merge-forward	2014-12-22 13:33:53 -07:00