Merge branch 'v4-stable' into v5-stable
authorRainer Gerhards <rgerhards@adiscon.com>
Mon, 16 Jan 2012 15:57:46 +0000 (16:57 +0100)
committerRainer Gerhards <rgerhards@adiscon.com>
Mon, 16 Jan 2012 15:57:46 +0000 (16:57 +0100)
commit2f2169c5c29d9f655a334c2da10d2582c5ffc82b
treec693b28a6ea5548af0a25676992af8f519036ff9
parent18e60f46a1bbdbcb446369a0f03dbb04f29fb71e
parent209a6d8e15afb83c0bf146dd95fc203bb9983242
Merge branch 'v4-stable' into v5-stable

Conflicts:
tools/syslogd.c
ChangeLog
tools/syslogd.c