Merge branch 'master_MDL-41806' of git://github.com/totara/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Sep 2013 23:01:23 +0000 (01:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Sep 2013 23:01:23 +0000 (01:01 +0200)
1  2 
lib/weblib.php

diff --cc lib/weblib.php
Simple merge