Merge commit 'origin/ser_core_cvs'
authorAndrei Pelinescu-Onciul <andrei@iptel.org>
Thu, 7 May 2009 12:55:01 +0000 (14:55 +0200)
committerAndrei Pelinescu-Onciul <andrei@iptel.org>
Thu, 7 May 2009 12:55:01 +0000 (14:55 +0200)
commit271bfb0e8f48fbc171f4ff04dbf092ace8f980c3
tree1f5fc91b91c1346c2b1656fbd549ac6df57650c8
parent8b5212639540cb5cc85e648fb2e59d43714fecdb
parent54dc33029c49da6f0ab28545c80a5aa99483ce42
Merge commit 'origin/ser_core_cvs'

* commit 'origin/ser_core_cvs':
  core: log L_CRIT fix
  sctp: internal macro/hooks for sctp events
  sctp: internal macro-hooks for stats

Conflicts:
dprint.c
dprint.h
dprint.c
dprint.h