Merge branch 'MDL-57531-master-phpmailer' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 4 Jan 2017 13:29:10 +0000 (13:29 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 4 Jan 2017 13:29:10 +0000 (13:29 +0000)
commitb6f5e57e450452fbecb59d4b50c054f3b1d50186
tree8146e42c106a047730ceb529a6ec9d5e30fce52e
parent41af8a5f903033bc40dee0820e574eeb8d5426d3
parent7620746f6743a7ab66c2205f3627252bc1797207
Merge branch 'MDL-57531-master-phpmailer' of git://github.com/mudrd8mz/moodle
lib/moodlelib.php
lib/upgrade.txt