Merge branch 'MDL-43785-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 27 Jul 2015 13:49:18 +0000 (14:49 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 27 Jul 2015 13:49:18 +0000 (14:49 +0100)
1  2 
lib/moodlelib.php

Simple merge