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

[Olle E. Johansson]

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

Author: Olle E. Johansson <oej at edvina.net>
Committer: Olle E. Johansson <oej at edvina.net>
Date:   Thu Nov 29 22:01:05 2012 +0100

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

* 'master' of ssh://git.sip-router.org/sip-router:
  kamctlrc: adding sca to the list of extra modules

---