[sr-dev] git:tmp/tm_async_reply_support: Merge branch 'master' into tmp/ tm_async_reply_support

[Richard Good]

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

Author: Richard Good <richard.good at smilecoms.com>
Committer: Richard Good <richard.good at smilecoms.com>
Date:   Mon Oct  7 12:52:53 2013 +0200

Merge branch 'master' into tmp/tm_async_reply_support

Conflicts:
	modules/tm/h_table.c

---