K 10 svn:author V 3 wen K 8 svn:date V 27 2014-06-08T05:09:44.906970Z K 7 svn:log V 41 - Adjust CONFLICTS to welcome moodle-2.7 END