Merge branch 'MDL-27125_master_2' of git://git.catalyst.net.nz/moodle-r2
authorSam Hemelryk <sam@moodle.com>
Tue, 3 Jul 2012 21:32:45 +0000 (09:32 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 3 Jul 2012 21:32:45 +0000 (09:32 +1200)
commitc425663c4c97ad0523335923fc7851712f2799f8
tree000cace4bbc4a7eaec5dfd2728db8f20b6cdc94e
parent5439f90aa3f39180550a59a6ccf7337da58a0131
parentdef4a8f5b78245c8196db1835b484ac461bfcbec
Merge branch 'MDL-27125_master_2' of git://git.catalyst.net.nz/moodle-r2
lib/filelib.php