Rainer Gerhards b003f85091 Merge branch 'beta'
Conflicts:

	ChangeLog
	configure.ac
	doc/manual.html
	plugins/imklog/linux.c
2008-06-12 08:25:05 +02:00
..
2008-02-28 11:18:59 +00:00
2008-04-01 17:07:41 +00:00
2008-05-21 11:45:40 +02:00
2008-01-28 16:29:08 +00:00
2008-01-18 14:45:11 +00:00
2008-05-06 10:25:42 +02:00
2008-06-12 08:21:22 +02:00
2008-04-15 11:07:59 +02:00
2008-04-01 17:07:41 +00:00
2008-05-16 14:46:03 +02:00
2008-05-28 15:37:22 +02:00
2008-06-11 17:28:21 +02:00