Module: sip-router Branch: sr_3.0 Commit: 2abd1340af64526f859741741693a66131fb52be URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2abd1340...

Author: Juha Heinanen jh@tutpro.com Committer: Juha Heinanen jh@tutpro.com Date: Sat Dec 26 16:00:55 2009 +0200

Merge branch 'sr_3.0' of ssh://jh@git.sip-router.org/sip-router into sr_3.0

* 'sr_3.0' of ssh://jh@git.sip-router.org/sip-router: tm: safer handling for local transactions and drop_replies!=0 sctp: stats: don't increment ASSOC_SHUTDOWN on COMM_LOST sctp: SCTP_STATS_ASSOC_SHUTDOWN tm doc: local_ack_mode documentation tm: new param: local_ack_mode makefile: fix make bin & basedir core: fix parsing for avps with the same name as a pv class

---