Colton Myers 7729834d92 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 ... Conflicts: salt/client/ssh/wrapper/__init__.py		2015-05-06 15:45:11 -06:00
..
arch.rst	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-02-20 13:51:59 -07: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	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-02-20 13:51:59 -07: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 remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-04-28 09:48:53 -06:00
windows.rst	2015.2 -> 2015.5	2015-05-06 11:40:01 -06:00