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

[Peter Dunkley]

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

Author: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
Committer: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
Date:   Sun Feb 10 22:43:50 2013 +0000

Merge branch 'master' into msrp

* master:
  app_python: fixed compilation errors and warnings.
  imc README updates. Configuration files works with 4.0.0 now.
  db_text change "openser" and minor edits
  maxfwd Update README, fix typos
  mangler Update README for readability
  ldap Add the README
  ldap Convert an "a" to an "o"
  kex Fix copy/paste typos and minor edits for readability
  ipops Minor updates to README
  mi_fifo Typo fixes mostly
  outbound - Fix typos in example configuration
  registrar: Fixed typo in event_route name, 'usrloc:expired-contact'
  siptrace Fix bug in documentation
  sipcapture - update example configuration
  xhttp_pi: documentation updates
  xhttp_rpc: documentation updates
  Revert "nathelper: add new option sipping_disable_bflag"
  msilo: safety check for freeing tmp_extra_headers
  xhttp_rpc Fix typo and minor formatting in README
  nathelper: add new option sipping_disable_bflag

---