Module: sip-router Branch: pd/outbound Commit: 064120b137e05e3799399664dbc48d0d1d5ba01b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=064120b… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Dec 21 23:34:35 2012 +0000 Merge branch 'master' into outbound * master: (592 commits) modules/app_lua: Updated app_lua to support URI lookup in registrar modules_k/registrar: Extended C-API to include a URI lookup pkg/kamailio/(centos|fedora): Added more modules moved from modules_s to modules to the build db_text More instructive error message modules_s/maxfwd: moved to obsolete folder maxfwd(k): max_limit module param can be changed at runtime uid_avp_db: fixed include from uid_domain module app_python: fixed complilation warnings [-Wformat] modules_s/uid_uri_db: moved to modules folder modules_s/uid_domain: moved to modules folder modules_s/uid_gflags: moved to modules folder modules_s/uid_avp_db: moved to modules folder modules_s/uid_auth_db: moved to modules folder modules_s/pike: moved to obsolete folder modules_s/uri_db: renamed to uid_uri_db modules_s/gflags: renamed to uid_gflags modules_s/domain: renamed to uid_domain uid_auth_db: updated doc file to the new name modules_s/avp_db: renamed to uid_avp_db modues_s/auth_db: renamed to uid_auth_db ... Conflicts: modules_k/nathelper/nathelper.c 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 ---