[sr-dev] git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router

[Peter Dunkley]

Module: sip-router
Branch: master
Commit: 263aae0a48f3a92a0e8c0ce43a7d6f610ea8a239
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=263aae0a48f3a92a0e8c0ce43a7d6f610ea8a239

Author: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
Committer: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
Date:   Wed Dec  5 15:13:48 2012 +0000

Merge branch 'master' of ssh://git.sip-router.org/sip-router

* 'master' of ssh://git.sip-router.org/sip-router: (268 commits)
  xcap_client: fix cross-compilation
  utils: fix libcurl dependency
  core: print debug message instead of info message when trying to resolve    something that is not domain name.
  Makefile: adding xhttp_pi to the list of excluded modules (depends on libxml2)
  xhttp_pi: fix installation of the pi_framework.xml file
  sca: fix DB updates
  sca: sca_subscription_print now logs at debug level
  tls: fix cross-compilation
  Makefile: fixed the option of setting some variables from command line
  Makefile.defs: version set to 3.4.0-dev7
  Makefile: default FLAVOUR set to kamailio
  sca: more cleanup of SCA example kamailio.cfg
  sca: include sample kamailio.cfg in docs, update function examples
  sca: move working example SCA kamailio.cfg to doc subdirectory
  app_python: better printing stacktrace
  app_lua: fix cross-compilation
  app_python: expand log facilities
  sca: remove public IP from example cfg
  sca: add working example kamailio.cfg
  carrierroute: fix cross-compilation
  ...

---