Rainer Gerhards c4b0f6bcae Merge branch 'v4-devel' into master
Conflicts:
	runtime/rsyslog.h
	runtime/wtp.c
2010-04-23 11:43:00 +01:00
..
2009-11-12 17:12:10 +01:00
2008-04-17 09:07:12 +02:00
2010-02-04 16:51:43 +01:00
2010-03-01 12:47:28 +01:00
2010-04-19 15:13:33 +02:00
2009-11-20 18:51:25 +01:00
2009-11-17 10:38:46 +01:00
2009-11-17 10:38:46 +01:00
2008-04-16 10:26:54 +02:00
2010-04-23 11:43:00 +01:00
2010-04-19 17:14:09 +02:00
2010-04-23 11:43:00 +01:00
2009-11-25 19:13:30 +01:00
2009-11-12 17:12:10 +01:00
2010-04-19 17:13:08 +02:00
2010-04-23 11:43:00 +01:00
2010-03-01 12:52:25 +01:00
2010-04-09 13:00:56 +02:00
2010-04-19 18:47:06 +02:00
2010-04-09 13:00:56 +02:00
2009-06-04 12:15:59 +02:00
2009-06-16 07:15:48 +02:00
2009-04-02 14:49:04 +02:00
2010-04-21 18:25:17 +01:00
2009-06-03 15:32:39 +02:00
2009-06-03 15:32:39 +02:00