Allow specifying the transifex rc file path
Merge branch '2014.1' of github.com:saltstack/salt into 2014.1
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.
According to the SunOS man page on flock:

	flock() applies or removes an advisory lock on the file associ-
     ated with the file descriptor fd. The compatibility version of
     flock() has been implemented on top of fcntl(2) locking.  It does
     not provide complete binary compatibility

This lack of binary compatibility results in some odd behavior when
running salt-master on a SunOS/SmartOS host. Specifically an IOError
[Errno 9] is thrown whenever the master calls the file_hash method.

Specifically it has to do with the fact that on SunOS/SmartOS the lock
is released when the file is closed,  whereas in Linux the lock is kept
until it is released. An article discussing the problem in detail can be
found here:

http://infinitesque.net/articles/2010/on%20Python%20flock/index.html

To get this working I changed salt/fileserver/roots.py to check os.uname()
to make sure it's not a SunOS host when setting HAS_FCNTL. Comments indicate
Windows shouldn't have this set either.
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
Merge pull request #10220 from s0undt3ch/2014.1

2014.1 Transifex and #10198 test case
Merge pull request #10218 from nshalman/fix-solaris-fcntl-2014.1

cherry-pick #10093 onto 2014.1 branch
pkgng: add with_origin option to list_pkgs()

This adds a new option to list_pkgs() which, if True, will return a more
complex data structure containing both the origin and version for each
package.
freebsdpkg: add with_origin option to list_pkgs()

This adds a new option to list_pkgs() which, if True, will return a more
complex data structure containing both the origin and version for each
package.