Rainer Gerhards 189a26c044 Merge branch 'v4-stable' into v5-stable
Conflicts:
	ChangeLog
	runtime/parser.c
	runtime/queue.c
	runtime/wtp.c
	template.c
	threads.c
	tools/syslogd.c
2010-12-16 13:59:16 +01: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