Merge commit 'origin/ser_core_cvs'
authorAndrei Pelinescu-Onciul <andrei@iptel.org>
Fri, 17 Jul 2009 16:09:01 +0000 (18:09 +0200)
committerAndrei Pelinescu-Onciul <andrei@iptel.org>
Fri, 17 Jul 2009 16:09:01 +0000 (18:09 +0200)
commit4d601c6d0b41eb26cc3a89ae3661b8be555f8dad
treea40927c1905891eefc4bc8836ff7ef7306348d92
parent98c5d63ebb246b1c640f228dcf0035e957246dd0
parentf9276a5b4875a1e3ecda29d50013725642cc8af2
Merge commit 'origin/ser_core_cvs'

* commit 'origin/ser_core_cvs':
  core: config parser listen if names fix
  core: config parser listen fix
  core: interface names in socket list port fix
  core: startup socket list fix
  core: parse_headers flags fix
  tm: fifo access From fix
  cfg framework: fix the group handles in the main process

Conflicts:
cfg.lex
cfg.y
cfg.lex
cfg.y
modules/tm/t_fifo.c
parser/msg_parser.c
socket_info.c