Merge branch 'master' into websocket
authorPeter Dunkley <peter.dunkley@crocodile-rcs.com>
Sat, 30 Jun 2012 20:13:58 +0000 (21:13 +0100)
committerPeter Dunkley <peter.dunkley@crocodile-rcs.com>
Sat, 30 Jun 2012 20:13:58 +0000 (21:13 +0100)
commitfd2a237fbac519ad709c5f169cbc3f29b125409f
tree2e796b0df055a0a52407211b9efc9cc35cd4a43e
parentb66e815ebe9ee9a5035abaf08c6e97a9c3281dcc
parent8c789cdeb969af921e74a4ece194ccda5c297e6a
Merge branch 'master' into websocket

Conflicts:
pkg/kamailio/fedora/16/kamailio.spec
modules/tm/tm.c
modules_k/pv/pv_core.c
pkg/kamailio/fedora/16/kamailio.spec