Merge branch 'MDL-53314-imap-debugging' of https://github.com/brendanheywood/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 30 Mar 2016 01:49:05 +0000 (09:49 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 30 Mar 2016 01:49:05 +0000 (09:49 +0800)
1  2 
admin/tool/messageinbound/classes/manager.php
config-dist.php

diff --cc config-dist.php
Simple merge