Colin Adams f11dbd9080 fix merge conflict from master

2013-03-21 15:55:14 +00:00

..

starts_with

Now WSF_FILTER_HANDLER is a handler and has formal generic G constrained to WSF_HANDLER

2013-03-21 15:47:10 +01:00

uri

Removed WSF_AGENT_HANDLER since it was an artificial notion,

2013-03-21 15:50:10 +01:00

uri_template

fix merge conflict from master

2013-03-21 15:55:14 +00:00