Module: sip-router Branch: pd/outbound Commit: 962fbef66a67c8c4ddf815e492b1f192a50339e7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=962fbef6...

Author: Peter Dunkley peter.dunkley@crocodile-rcs.com Committer: Peter Dunkley peter.dunkley@crocodile-rcs.com Date: Sun Aug 19 22:38:13 2012 +0100

Merge branch 'master' into outbound

Conflicts: pkg/kamailio/fedora/16/kamailio.spec

---