John Nunemaker a936eaab93 Merge branch 'openssl-ciphers2' of https://github.com/where/httparty into where-openssl-ciphers2 ... Conflicts: spec/httparty/connection_adapter_spec.rb		2013-01-02 16:11:11 -05:00
..
httparty	Merge branch 'openssl-ciphers2' of https://github.com/where/httparty into where-openssl-ciphers2	2013-01-02 16:11:11 -05:00
httparty.rb	Add support for passing in ciphers information into the ConnectionAdapter, and have this work as expected with the Net:HTTP ConnectionAdapter.	2013-01-02 13:39:53 -05:00