Merge remote branch 'origin/daniel/xavp'
authorAndrei Pelinescu-Onciul <andrei@iptel.org>
Mon, 15 Feb 2010 14:47:37 +0000 (15:47 +0100)
committerAndrei Pelinescu-Onciul <andrei@iptel.org>
Mon, 15 Feb 2010 14:47:37 +0000 (15:47 +0100)
commit98529eaf530122f8cf4fbe8115c48c3400d764fd
treedd3c0d50405f84861ffee037210717ea25b2b57d
parent59c31fe72e95d60f42752bfcae3a18563b2c9700
parentd68a8b4db09c210f5281784a21731d6069605e58
Merge remote branch 'origin/daniel/xavp'

* origin/daniel/xavp:
  pv: export new PV class $xavp(name)
  core: introducing xavp (eXtended AVP)
  tm: set/reset head of xavps on TM events
  pv: new pv class $xavp(...)
  core: destroy xavp list once sip msg processing is done

Conflicts:
modules/tm/h_table.c
modules/tm/t_reply.c
modules/tm/uac.c
modules_k/pv/pv.c
modules/tm/h_table.c
modules/tm/h_table.h
modules/tm/t_hooks.c
modules/tm/t_reply.c
modules/tm/uac.c
modules_k/pv/pv.c
receive.c