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
..
2010-10-19 12:54:38 +02:00
2009-06-29 10:58:38 +02:00
2010-12-16 13:59:16 +01:00
2009-04-17 15:10:06 +02:00
2009-07-03 11:57:21 +02:00
2008-04-08 14:40:19 +02:00
2010-04-12 17:09:50 +02:00
2010-04-12 17:09:50 +02:00
2010-04-12 17:09:50 +02:00