Colton Myers c3b7be0655 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: doc/topics/installation/rhel.rst salt/output/__init__.py salt/utils/__init__.py		2015-02-20 13:51:59 -07: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 branch '2014.7' into merge-forward	2014-12-16 14:45:25 -07:00
windows.rst	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-02-20 13:51:59 -07:00