Merge git://factorcode.org/git/factor

Conflicts:

	extra/http/http.factor

diff --cc extra/http/http.factor
index a71e003433b4dec191fd8a000a707b565763ef28,1bd9e18d98f752a5b9e049fcd6258f9d0a43a2d3..4999559324d227f34055bf98e6df582bcb4c7e5f
--- 1/extra/http/http.factor
--- 2/extra/http/http.factor
+++ b/extra/http/http.factor
@@@ -1,7 -1,7 +1,7 @@@
  ! Copyright (C) 2003, 2007 Slava Pestov.
  ! See http://factorcode.org/license.txt for BSD license.
  USING: hashtables io kernel math namespaces math.parser assocs
- sequences strings splitting assocs.lib ;
 -sequences strings splitting ascii io.utf8 ;
++sequences strings splitting ascii io.utf8 assocs.lib ;
  IN: http
  
  : header-line ( line -- )

diff --cc extra/sequences/lib/lib.factor
Simple merge