Merge branch 'MDL9443_Filter_XHTML_files.2014-11-19' of git://github.com/Dave-B/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Nov 2014 17:26:30 +0000 (17:26 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Nov 2014 17:26:30 +0000 (17:26 +0000)
1  2 
lib/filelib.php

diff --cc lib/filelib.php
Simple merge