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)
1  2 
lib/filelib.php

diff --cc lib/filelib.php
Simple merge