Merge commit 'origin/andrei/path'
authorAndrei Pelinescu-Onciul <andrei@iptel.org>
Fri, 18 Sep 2009 11:36:33 +0000 (13:36 +0200)
committerAndrei Pelinescu-Onciul <andrei@iptel.org>
Fri, 18 Sep 2009 11:36:33 +0000 (13:36 +0200)
commit0fa4b2d5a4d9700eed970d36ed1bb803c1f07d21
tree363895406690bf45f9c0dad762b32a2395b65487
parent5b1cd719918a51ca8f4b4a05dbc34e27fd1ae58c
parent3c7744da21a2c2cb82dfdfc28f43f65e139b91cf
Merge commit 'origin/andrei/path'

* commit 'origin/andrei/path':
  core: add path route headers after local via
  core: path support when forwarding
  tm: path support
  xlog(s): updated to the new next_branch()
  registrar(s): updated to the new append_branch()
  permissions(s): updated to the new next_branch()
  osp(s): updated to the new append_branch()
  exec(s): use ser_append_branch() instead of append_branch()
  cpl-c(s): updated to the new append_branch()
  tm: updated to the new append_branch() & next_branch()
  enum: s/km_append_brach/append_branch/
  avpops: updated to the new append_branch()
  core: append_branch & next_branch api changes

Conflicts:
modules/tm/sip_msg.c
modules/tm/t_fwd.c
action.c
modules/tm/h_table.c
modules/tm/t_fwd.c
sip_msg_clone.c