Merge branch 'master' into websocket
authorPeter Dunkley <peter.dunkley@crocodile-rcs.com>
Thu, 5 Jul 2012 21:55:44 +0000 (22:55 +0100)
committerPeter Dunkley <peter.dunkley@crocodile-rcs.com>
Thu, 5 Jul 2012 21:55:44 +0000 (22:55 +0100)
commit380ab4c742c4060d7601e4b0491ebdb9eb0bb157
tree971bc7650e079c4702da69935a574165ebd3ac2b
parenta4db0a0f9577477a15f90e3e4674a941aa306730
parentef6da283105197eda608cc3571cfc6772c343aa6
Merge branch 'master' into websocket

Conflicts:
pkg/kamailio/fedora/16/kamailio.spec
parser/parse_uri.c
parser/parse_via.c
pkg/kamailio/fedora/16/kamailio.spec