Add proxy minion release notes
Revert "Added Saltconf banner to docs sidebar"

This reverts commit 70be208bc555e0b3f61419e5a041200b2235f080.

Conflicts:
	doc/_themes/saltstack/layout.html
Revert "Added SaltConf banner to main docs page"

This reverts commit 9834a9afdace80746ab023d402a01f1dbe226eba.

Conflicts:
	doc/_static/saltconf.jpg
	doc/index.rst
Merge pull request #10178 from whiteinge/hydrogen-remove-saltconf-banner

Hydrogen remove saltconf banner
Fix cron state to work on SmartOS

SmartOS and Solaris are both in the Solaris os_family
If we use that grain, the module should work on SmartOS
Merge pull request #10189 from nshalman/smartos-cron-fix-2014.1

Fix cron state to work on SmartOS
Loosen regex to allow for quoting quirk on Ubuntu 10.x
Tighten up regex a bit
Fix ssh_auth pulling keyfile from correct env
Revert "Revert "SmartOS Esky build: Just try to grab everything""

This reverts commit 85990309f4da1c9b752846e920ece79956311605.
Merge pull request #10197 from mbarrien/ssh-auth-env

Fix ssh_auth pulling keyfile from correct env
Merge branch '2014.1' of github.com:saltstack/salt into 2014.1
Provide tests cases for #10197 and #10198