Merge branch 'MDL-57080-m' of https://github.com/micaherne/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Jan 2017 12:15:01 +0000 (12:15 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Jan 2017 12:15:01 +0000 (12:15 +0000)
1  2 
course/tests/courselib_test.php
lib/moodlelib.php

Simple merge
Simple merge