Merge branch 'MDL-37395-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jan 2013 17:17:12 +0000 (18:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jan 2013 17:17:12 +0000 (18:17 +0100)
1  2 
lib/filelib.php

diff --cc lib/filelib.php
Simple merge