Module: sip-router Branch: tmp/tm_async_reply_support Commit: ac41a0b65afdd0a0dafdcbdd44973a86f8a55cf1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ac41a0b… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Mon Sep 30 22:59:56 2013 +0200 Merge branch 'master' into tmp/tm_async_reply_support Conflicts: modules/tm/h_table.h modules/tm/lock.c modules/tm/t_fwd.c modules/tm/t_reply.c modules/tm/t_reply.h modules/tm/t_suspend.c ---