Merge branch 'master_MDL-54575' of git://github.com/danmarsden/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 7 Nov 2016 05:58:04 +0000 (13:58 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 7 Nov 2016 05:58:04 +0000 (13:58 +0800)
commit2a9275601a835610a17d27492a42ecbefcfeb964
treeff5897974fa9748e6a779a70c8490f37f425473e
parenta2c05288029f1549b29970ab1cf4f86b0b9c7c3a
parent3dc868478b773d8946bb080e5574eaf6a71643e0
Merge branch 'master_MDL-54575' of git://github.com/danmarsden/moodle