Merge branch 'w39_MDL-37324_m26_phpmailer' of https://github.com/skodak/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 23 Sep 2013 08:15:35 +0000 (18:15 +1000)
committerMarina Glancy <marina@moodle.com>
Mon, 23 Sep 2013 08:15:35 +0000 (18:15 +1000)
1  2 
lib/moodlelib.php
lib/thirdpartylibs.xml

Simple merge
Simple merge