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

Author: Peter Dunkley peter.dunkley@crocodile-rcs.com Committer: Peter Dunkley peter.dunkley@crocodile-rcs.com Date: Thu Jul 5 22:55:44 2012 +0100

Merge branch 'master' into websocket

Conflicts: pkg/kamailio/fedora/16/kamailio.spec

---