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)
commit5e16bdb25c228a376c33665c6733c141ee6c3bd0
tree1d5980da7c26be0c3af8736c9b23337b8d1caa39
parent9423674717eb7c66f48b8517678d656baa513631
parent3bf048284189ce77a6bd0257f1dcfe803e01fb63
Merge branch 'MDL-55724-master' of https://github.com/sammarshallou/moodle
lib/weblib.php