Merge branch 'm31_MDL-52637_Disable_Automatically_Enabling_TLS_Encryption' of https...
authorDavid Monllao <davidm@moodle.com>
Mon, 8 Feb 2016 05:47:06 +0000 (13:47 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 8 Feb 2016 05:47:06 +0000 (13:47 +0800)

Trivial merge