Merge branch 'MDL-60528-m' of https://github.com/micaherne/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 30 Oct 2017 16:58:39 +0000 (17:58 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 30 Oct 2017 16:58:39 +0000 (17:58 +0100)
commit28196427a26b4f3a30ec9ef99e35372ca4fdcc67
treed2f2d0bf4a6a3cc7fa9cbdead464f067b9fd4aa7
parent64476c520eafef80850fc68da8caca3296f9e595
parent71826ac268b9d27fc1f8c0151531b29217f9c86e
Merge branch 'MDL-60528-m' of https://github.com/micaherne/moodle