Merge branch 'MDL-48194-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Nov 2014 00:39:03 +0000 (13:39 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Nov 2014 00:39:03 +0000 (13:39 +1300)
1  2 
lib/phpunit/classes/util.php

Simple merge