K 10
svn:author
V 4
gahr
K 8
svn:date
V 27
2014-03-06T10:08:06.263564Z
K 7
svn:log
V 44
- Fix CONFLICTS line

Suggested by:	thierry

END