K 10 svn:author V 3 wen K 8 svn:date V 27 2015-05-14T07:49:03.899830Z K 7 svn:log V 39 - Adjust CONFLICTS to welcome moodle29 END