Merge branch 'w12_MDL-44527_m27_cacert' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Mar 2014 23:52:19 +0000 (12:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Mar 2014 23:52:19 +0000 (12:52 +1300)

Trivial merge