[sr-dev] git:oej/permissionsrpc: Merge branch 'master' into oej/permissionsrpc

Module: sip-router Branch: oej/permissionsrpc Commit: b051b01bb8827a9db7463affb4865e6a05f6dbb0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b051b01… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sat Dec 29 09:31:18 2012 +0100 Merge branch 'master' into oej/permissionsrpc While looking at the falling snow outside... * master: modules_s/usrloc: moved to obsolete folder modules_s/registrar: moved to obsolete folder modules_s/.gitkeep: added a placeholder to keep empty modules_s folder for a while Makefile: make TAGS skips the obsolete folder usrloc(k): fixed position of xavp_contact parameter in docs usrloc: store per-contact attributes in database core: fixed xavp level cloning function core: added a fuction that adds an xavp with an xavp value kamctl: regenerated database creation scripts lib/srdb1: added location_attrs table 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 eras, och ett tomt meddelande ---