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)
commitc2df528806efa9540685213b25e9c6f3f9e38845
tree029fab98db597849fdaf868bdbb2e7d6aac92735
parent6893691b34633626979ef38873647048baa88507
parent28e27ac837e9bc333b1ffe2cc1cd6be10c01bb3e
Merge branch 'wip-MDL-55581-master' of git://github.com/marinaglancy/moodle
lib/weblib.php