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
..
2009-06-02 07:44:07 +02:00
2010-10-27 10:10:47 +02:00
2009-11-25 14:53:20 +01:00
2010-04-09 13:00:56 +02:00
2010-04-09 13:00:56 +02:00
2009-11-12 17:12:10 +01:00
2009-11-12 14:46:09 +01:00
2010-04-15 18:15:47 +02:00
2010-07-21 14:46:10 +02:00
2010-08-11 15:13:53 +02:00