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

Author: Peter Dunkley peter.dunkley@crocodile-rcs.com Committer: Peter Dunkley peter.dunkley@crocodile-rcs.com Date: Fri Sep 28 21:50:16 2012 +0100

Merge branch 'master' into outbound

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

---