Merge branch 'wip-MDL-34063-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 5 Jul 2012 16:34:27 +0000 (18:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 5 Jul 2012 16:34:27 +0000 (18:34 +0200)
1  2 
lib/filelib.php

diff --cc lib/filelib.php
Simple merge