Merge commit 'origin/ser_modules'
authorAndrei Pelinescu-Onciul <andrei@iptel.org>
Fri, 26 Jun 2009 18:24:24 +0000 (20:24 +0200)
committerAndrei Pelinescu-Onciul <andrei@iptel.org>
Fri, 26 Jun 2009 18:24:24 +0000 (20:24 +0200)
commit12e28271dd9af2bd1cdedd6d9930b2159bafca90
treeb1c0674e137f843c9b9a3bdb35a454dcb1729f86
parentbad3c064285bb56cb367081c268d4ea7a47b927e
parentb9ec92931879ddc30bf149d5187bb15ef4c58329
Merge commit 'origin/ser_modules'

* commit 'origin/ser_modules':
  - iptrtpproxy_adjust_timeout() function
modules_s/iptrtpproxy/iptrtpproxy.c