Merge branch 'MDL-41196-m' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 Aug 2013 21:56:16 +0000 (09:56 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 Aug 2013 21:56:16 +0000 (09:56 +1200)
commit93564564e471a658e3da1486a2fa78cad029595b
treec0d84f1ffbc93be00b89df93f72be31b1edbe2e3
parentc161e4687c6b5331415c4cd8f150e51f6543a986
parent1aba6b2b4d15daac03a09ff14b355e6bcbe651ee
Merge branch 'MDL-41196-m' of git://github.com/andrewnicols/moodle
lib/phpmailer/moodle_phpmailer.php
lib/phpunit/classes/advanced_testcase.php
lib/phpunit/classes/util.php