Merge branch 'ser_core_cvs' of ssh://git.sip-router.org/sip-router
authorAndrei Pelinescu-Onciul <andrei@iptel.org>
Tue, 31 Mar 2009 17:26:41 +0000 (19:26 +0200)
committerAndrei Pelinescu-Onciul <andrei@iptel.org>
Tue, 31 Mar 2009 17:26:41 +0000 (19:26 +0200)
* 'ser_core_cvs' of ssh://git.sip-router.org/sip-router:
  dns: minor fixes
  Static buffer is resetted before calling the route block -- Thanks to Jan.
  Missing include is added.

Conflicts:
modules/tm/t_suspend.c : sip-router version uses
i                        run_top_route()

1  2 
modules/tm/t_suspend.c
resolve.c

Simple merge
diff --cc resolve.c
Simple merge