K 10 svn:author V 3 wen K 8 svn:date V 27 2016-05-24T08:41:11.888375Z K 7 svn:log V 41 - Adjust CONFLICTS to welcome moodle-3.1 END