Merge branch 'MDL-54110_master' of https://github.com/marxjohnson/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 May 2016 02:10:57 +0000 (10:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 May 2016 02:10:57 +0000 (10:10 +0800)
1  2 
lib/tests/moodlelib_test.php

Simple merge