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

[Olle E. Johansson]

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

Author: Olle E. Johansson <oej at edvina.net>
Committer: Olle E. Johansson <oej at edvina.net>
Date:   Sun Oct 28 21:12:03 2012 +0100

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

* 'master' of ssh://git.sip-router.org/sip-router:
  modules_k/nathelper: add_contact_alias ipv6 fix
  lib/srdb1/schema: use &ip_addr_len; entity in address and lcr_gw schema

---