Rainer Gerhards 68c13f3f6a Merge branch 'v4-devel' into v5-devel
Conflicts:
	ChangeLog
	configure.ac
	doc/imfile.html
	doc/manual.html
	plugins/imudp/imudp.c
	runtime/msg.h
	tools/syslogd.c
2010-12-17 12:39:59 +01:00
..
2010-10-11 17:11:00 +02:00
2008-04-16 15:27:53 +02:00
2008-04-16 15:27:53 +02:00
2008-04-16 15:27:53 +02:00
2010-02-28 17:28:52 +01:00
2008-04-16 15:27:53 +02:00
2008-04-16 15:27:53 +02:00
2009-04-02 15:12:57 +02:00
2008-04-16 15:27:53 +02:00
2010-06-23 12:48:27 +02:00
2010-06-23 12:48:27 +02:00
2010-06-23 12:48:27 +02:00
2010-06-23 12:48:27 +02:00