Merge branch 'master' into websocket
authorPeter Dunkley <peter.dunkley@crocodile-rcs.com>
Thu, 5 Jul 2012 20:15:22 +0000 (21:15 +0100)
committerPeter Dunkley <peter.dunkley@crocodile-rcs.com>
Thu, 5 Jul 2012 20:15:22 +0000 (21:15 +0100)
commita4db0a0f9577477a15f90e3e4674a941aa306730
tree38a51203076eb08b88a7675c64bb3096c81d1066
parent6af91d1fb3839fd02cd2739d9c8c784497e1d6e9
parent2b392e46054bfe5f6ab475a53ba3212d548f2c7f
Merge branch 'master' into websocket

Conflicts:
Makefile
pkg/kamailio/centos/6/kamailio-build.appl
pkg/kamailio/centos/6/kamailio.appl
pkg/kamailio/fedora/16/kamailio-build.appl
pkg/kamailio/fedora/16/kamailio.appl
pkg/kamailio/fedora/16/kamailio.spec
pkg/kamailio/fedora/17/kamailio-build.appl
pkg/kamailio/fedora/17/kamailio.appl
Makefile
pkg/kamailio/centos/6/kamailio-build.appl
pkg/kamailio/centos/6/kamailio.appl
pkg/kamailio/fedora/16/kamailio-build.appl
pkg/kamailio/fedora/16/kamailio.appl
pkg/kamailio/fedora/16/kamailio.spec
pkg/kamailio/fedora/17/kamailio-build.appl
pkg/kamailio/fedora/17/kamailio.appl