K 10
svn:author
V 2
cs
K 8
svn:date
V 27
2017-10-05T19:27:45.499842Z
K 7
svn:log
V 103
Resolve conflict

PR:		222382
Submitted by:	Jens Grassel <jan0sch@mykolab.com>
Approved by:	maintainer

END