CHEF-4939, CVE-2013-4353:  Update to openssl 1.0.1f.
(carefully crafted invalid TLS handshake causes an NPE in OpenSSL)
Merge pull request #113 from opscode/CHEF-4939

CHEF-4939, CVE-2013-4353:  Update to openssl 1.0.1f.
[berkshelf] bump version to 2.0.12

`berkshelf` 1.4.3 was VERY old and began pulling in an incompatible 
`faraday` 0.9.0. The 2.0.x series of `berkshelf` should remain 
compatible with existing 1.4.x Berksfiles.
Merge pull request #116 from opscode/schisamo/berkshelf-update

[berkshelf] bump version to 2.0.12
Merge branch 'opscode'
Disable ACL support in RSync
Merge branch 'feature/rsync-without-acl'
Merge branch 'master' into for/idk