Rainer Gerhards 8a1751d1c9 Merge branch 'v3-stable' into beta
Conflicts:

	ChangeLog
	configure.ac
	doc/rsyslog_ng_comparison.html
2008-08-15 12:59:24 +02:00
..
2008-08-15 12:59:24 +02:00
2008-07-25 13:51:46 +02:00
2008-07-15 16:11:05 +02:00
2008-05-06 10:58:06 +02:00
2008-07-01 15:09:07 +02:00