Merge branch 'master' into experimental (untested!)

Conflicts:
	basis/http/client/client.factor

diff --cc basis/http/client/client.factor
index e6435ee12b48a9427d1f3671c862c01be1a4ef04,108ae5ecc4c28bbbea3f2441288f8ff48fc09088..9c56411290ab4c7b4b9647658958838747a2199d
--- 1/basis/http/client/client.factor
--- 2/basis/http/client/client.factor
+++ b/basis/http/client/client.factor
@@@ -218,8 -198,6 +220,12 @@@ M: download-failed error
  : http-post ( post-data url -- response data )
      <post-request> http-request ;
  
 +: <put-request> ( data url -- request )
 +    <client-data-request> "PUT" >>method ;
 +
 +: http-put ( data url -- response data )
 +    <put-request> http-request ;
++
+ USING: vocabs vocabs.loader ;
+ 
+ "debugger" vocab [ "http.client.debugger" require ] when

diff --cc basis/urls/encoding/encoding.factor
Simple merge