Merge branch 'MDL-55724-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Sep 2016 15:33:25 +0000 (17:33 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Sep 2016 15:33:25 +0000 (17:33 +0200)
1  2 
lib/weblib.php

diff --cc lib/weblib.php
Simple merge