K 10
svn:author
V 7
antoine
K 8
svn:date
V 27
2014-07-20T22:43:19.373728Z
K 7
svn:log
V 23
Fix CONFLICTS line too

END