Rainer Gerhards 0cc1ef8ac8 Merge branch 'v8-stable'
Conflicts:
	plugins/ommail/ommail.c
2014-10-08 19:06:47 +02:00
..
2014-10-08 19:06:47 +02:00