Module: sip-router Branch: pd/outbound Commit: 7fce787c316de12fd3294ca2a70d79d71ff2ad1b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7fce787c...

Author: Peter Dunkley peter.dunkley@crocodile-rcs.com Committer: Peter Dunkley peter.dunkley@crocodile-rcs.com Date: Wed Dec 26 14:25:44 2012 +0000

Merge branch 'master' into outbound

* master: core: check for IP in no_naptr_srv_sip_resolvehost() core: try all srv protocols when not already set registrar(k): restore the location contact xavp upon lookup usrloc(k): option to store xavp per contact core: extended xavp api registrar(k): use only pre-existing branches in lookup_branches() p_usrloc: clean memory in case of malloc error Revert "Changing to kamcmd" kamcmd changes Changing to kamcmd kamcmd Updating docs Change "sercmd" to "kamcmd" in module documentation files - README kamctl Fix typo that causes the "trusted" help to be printed twice and "address" zero times kamctl Change "sercmd" to "kamcmd" in help texts Fixing compiler warnings

---