Merge branch 'wip-MDL-55581-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 29 Aug 2016 08:53:46 +0000 (16:53 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 29 Aug 2016 08:53:46 +0000 (16:53 +0800)
1  2 
lib/weblib.php

diff --cc lib/weblib.php
Simple merge