30 Jun
2012
30 Jun
'12
10:14 p.m.
Module: sip-router
Branch: pd/websocket
Commit: fd2a237fbac519ad709c5f169cbc3f29b125409f
URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fd2a237…
Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com>
Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com>
Date: Sat Jun 30 21:13:58 2012 +0100
Merge branch 'master' into websocket
Conflicts:
pkg/kamailio/fedora/16/kamailio.spec
---