Merge branch 'master' of git://factorcode.org/git/factor

diff --cc basis/db/db.factor
index 5b159d0ea19f4859426b587fbaeffb313680500d,87bf21d26139e431bccce30bb5a2686713925abf..5b159d0ea19f4859426b587fbaeffb313680500d
mode 100755,100644..100644
--- 1/basis/db/db.factor
--- 2/basis/db/db.factor
+++ b/basis/db/db.factor

diff --cc basis/db/postgresql/postgresql.factor
index 08df25c13a9ff27e2950cf6f5d99cb5a7956ca9c,28548d1260efe456c23820552e89fa9fe1c05d44..08df25c13a9ff27e2950cf6f5d99cb5a7956ca9c
mode 100755,100644..100644
--- 1/basis/db/postgresql/postgresql.factor
--- 2/basis/db/postgresql/postgresql.factor
+++ b/basis/db/postgresql/postgresql.factor

diff --cc basis/db/sqlite/sqlite.factor
index dfe4fdf47523d968b8a66bd2845efb0b13b3d8c1,dfd9fab08c49d1cc3f389b92f8cc1fb60e4b21ec..dfe4fdf47523d968b8a66bd2845efb0b13b3d8c1
mode 100755,100644..100644
--- 1/basis/db/sqlite/sqlite.factor
--- 2/basis/db/sqlite/sqlite.factor
+++ b/basis/db/sqlite/sqlite.factor

diff --cc basis/db/tuples/tuples-tests.factor
index f5569a97cd3eda19a93b8fda6c4e4f91caa58a02,6114c7ebe1dc6ecefafe8a52cc13b3e169033db3..f5569a97cd3eda19a93b8fda6c4e4f91caa58a02
mode 100755,100644..100644
--- 1/basis/db/tuples/tuples-tests.factor
--- 2/basis/db/tuples/tuples-tests.factor
+++ b/basis/db/tuples/tuples-tests.factor

diff --cc basis/furnace/auth/providers/db/db-tests.factor
index 3bcd82a15dbb7b127abb3f414c5131bede3732a5,fac5c23e4a013a541d711c2786e507fec3b1acdc..3bcd82a15dbb7b127abb3f414c5131bede3732a5
mode 100755,100644..100644
--- 1/basis/furnace/auth/providers/db/db-tests.factor
--- 2/basis/furnace/auth/providers/db/db-tests.factor
+++ b/basis/furnace/auth/providers/db/db-tests.factor

diff --cc basis/furnace/db/db.factor
index ed18e42a4fe8c767aa26d34ffd8eff65dc91a432,b4a438601500d774f139925fb761746b2c92e8c8..ed18e42a4fe8c767aa26d34ffd8eff65dc91a432
mode 100755,100644..100644
--- 1/basis/furnace/db/db.factor
--- 2/basis/furnace/db/db.factor
+++ b/basis/furnace/db/db.factor

diff --cc basis/furnace/sessions/sessions-tests.factor
index 6bb3c1cd6927bdfa73c949184a9bf7355d9e9294,ff089a92b22265719bc15d9e377c5578f4a1dc82..6bb3c1cd6927bdfa73c949184a9bf7355d9e9294
mode 100755,100644..100644
--- 1/basis/furnace/sessions/sessions-tests.factor
--- 2/basis/furnace/sessions/sessions-tests.factor
+++ b/basis/furnace/sessions/sessions-tests.factor

diff --cc basis/http/http-tests.factor
index eb8ba34f9e44d268ddcb0fcf1ab0764dc3876a94,49ef03543ece56cf77111822b4bd5c498e301c13..608ba0c88fd1205bf06280376f7086e2eb11cb1b
mode 100755,100644..100644
--- 1/basis/http/http-tests.factor
--- 2/basis/http/http-tests.factor
+++ b/basis/http/http-tests.factor
@@@ -179,10 -179,10 +179,10 @@@ http.server.dispatchers db.tuples 
  
  : add-quit-action
      <action>
-         [ stop-server "Goodbye" "text/html" <content> ] >>display
+         [ stop-this-server "Goodbye" "text/html" <content> ] >>display
      "quit" add-responder ;
  
 -: test-db "test.db" temp-file sqlite-db ;
 +: test-db "test.db" temp-file <sqlite-db> ;
  
  [ test-db drop delete-file ] ignore-errors