[sr-dev] git:pd/websocket: Merge branch 'master' into websocket

[Peter Dunkley]

Module: sip-router
Branch: pd/websocket
Commit: a4db0a0f9577477a15f90e3e4674a941aa306730
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a4db0a0f9577477a15f90e3e4674a941aa306730

Author: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
Committer: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
Date:   Thu Jul  5 21:15:22 2012 +0100

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

---