Merge branch 'MDL-44626-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 Feb 2016 10:36:20 +0000 (10:36 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 15 Feb 2016 10:36:20 +0000 (10:36 +0000)
1  2 
lib/moodlelib.php

Simple merge