[sr-dev] git:pd/websocket: Merge branch 'master' into websocket

[Peter Dunkley]

Module: sip-router
Branch: pd/websocket
Commit: 7a3ce731e73d4b47646f2562e588886137cc8e85
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7a3ce731e73d4b47646f2562e588886137cc8e85

Author: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
Committer: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
Date:   Sat Jul  7 17:52:20 2012 +0100

Merge branch 'master' into websocket

---