Merge branch 'master' into sol-test
authorRainer Gerhards <rgerhards@adiscon.com>
Tue, 31 Mar 2009 18:06:10 +0000 (20:06 +0200)
committerRainer Gerhards <rgerhards@adiscon.com>
Tue, 31 Mar 2009 18:06:10 +0000 (20:06 +0200)
commit3b9fd5330a6599c00e9c3c0a4080a141f173aa6a
treef01a660c1ccf5070101b32a9e7eb75e07c0c6e57
parent3e3a9bc9982331e44cf397fef131e75553f2ab2c
parent91d6888a8afe562bf4d2ef53be94c41898e1a2ec
Merge branch 'master' into sol-test

Conflicts:
tests/Makefile.am
ChangeLog
configure.ac
tests/Makefile.am
tools/syslogd.c