Merge remote-tracking branch 'origin/master' into rewrite-filter

diff --cc src/Makefile.am
index 42bb6b3,ea0cd46..92f526e
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -58,8 -56,9 +57,10 @@@ libmetaproxy_la_SOURCES = 
        torus.cpp torus.hpp \
        url_recipe.cpp \
        util.cpp \
 +      html_parser.hpp html_parser.cpp \
        router_chain.cpp \
+         router_flexml.hpp router_flexml.cpp \
+       router_xml.cpp \
        xmlutil.cpp
  
  libmetaproxy_la_LIBADD = $(YAZPPLALIB) \

diff --cc src/factory_static.cpp
Simple merge