Merge branch 'MDL-50868-master' of git://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 28 Jul 2015 11:10:55 +0000 (12:10 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 28 Jul 2015 11:10:55 +0000 (12:10 +0100)
1  2 
lib/weblib.php

diff --cc lib/weblib.php
Simple merge