Rainer Gerhards 829385ce40 Merge branch 'beta'
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	doc/rsyslog_conf.html
2009-04-07 14:58:58 +02:00
..
2008-11-26 14:17:36 +01:00
2009-04-02 12:57:37 +02:00
2008-02-28 11:18:59 +00:00
2009-03-11 15:16:57 +01:00
2009-04-07 14:58:58 +02:00
2009-03-11 15:16:57 +01:00
2009-03-11 15:16:57 +01:00
2008-11-21 15:38:34 +01:00
2009-03-18 17:55:15 +01:00
2008-11-11 11:00:37 +01:00
2009-03-11 15:16:57 +01:00
2009-03-11 15:16:57 +01:00
2008-06-20 11:53:05 +02:00
2008-09-23 13:32:05 +02:00