commit 0fa4ac6a437864b9357512b49dd79d697e18626d Merge: cfc01b6 f230c48 Author: David Fifield david@bamsoftware.com Date: Wed Mar 13 01:37:17 2013 -0700

Merge branch 'url_reg'

doc/facilitator-howto.txt | 10 +++- facilitator/facilitator.cgi | 42 ++++++++++++---- flashproxy-reg-url | 117 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 156 insertions(+), 13 deletions(-)