Rainer Gerhards 115718de96 Merge branch 'v5-stable' into v5-devel
Conflicts:
	ChangeLog
	plugins/imklog/imklog.c
	plugins/imklog/imklog.h
2012-03-01 12:25:39 +01:00
..
2010-04-12 17:09:50 +02:00
2010-04-12 17:09:50 +02:00