Module: sip-router Branch: pd/websocket Commit: fd2a237fbac519ad709c5f169cbc3f29b125409f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fd2a237fbac519ad709c5f169cbc3f29b125409f
Author: Peter Dunkley <[email protected]> Committer: Peter Dunkley <[email protected]> Date: Sat Jun 30 21:13:58 2012 +0100 Merge branch 'master' into websocket Conflicts: pkg/kamailio/fedora/16/kamailio.spec --- _______________________________________________ sr-dev mailing list [email protected] http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
