Merge branch 'MDL-36708-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 16 Jan 2013 03:39:03 +0000 (11:39 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 16 Jan 2013 03:39:03 +0000 (11:39 +0800)
commit856df69f3d0dcdc1bdd61405a17009f5df7574e1
treef2776bd97f64848d06a37100c70c5ebaea6359d9
parent0f94289c1dce2909efccbc936968ff8cac389fbb
parent212dac2724c8ffcca167cd8c08246673a4e1f296
Merge branch 'MDL-36708-master' of git://github.com/FMCorz/moodle
lib/filelib.php