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

diff --cc extra/http/server/server.factor
Simple merge

diff --cc extra/http/server/templating/chloe/chloe.factor
Simple merge

diff --cc extra/serialize/serialize.factor
Simple merge

diff --cc extra/webapps/planet/planet.factor
index 99456e092b9f5a451106a9b03ac4cf5b95a9c188,752db18ee7d30d838e073cd8fa77f436c9929228..d034b413bbfd335688f06ad6f902bad7af76d1d2
--- 1/extra/webapps/planet/planet.factor
--- 2/extra/webapps/planet/planet.factor
+++ b/extra/webapps/planet/planet.factor
@@@ -1,8 -1,8 +1,8 @@@
  ! Copyright (C) 2008 Slava Pestov.
  ! See http://factorcode.org/license.txt for BSD license.
 -USING: kernel accessors sequences sorting locals math
 +USING: kernel accessors sequences sorting locals math math.order
  calendar alarms logging concurrency.combinators namespaces
- sequences.lib db.types db.tuples db
+ sequences.lib db.types db.tuples db fry
  rss xml.writer
  http.server
  http.server.crud