Merge branch 'MDL-55062_master' of git://github.com/markn86/moodle
commit428e18ed2b9fbd8737be49b6d3667f733e532c37
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 14 Dec 2016 01:26:10 +0000 (14 09:26 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 14 Dec 2016 01:26:10 +0000 (14 09:26 +0800)
treea44a1f84893bb104754aefdde6fa381b1bf1df49
parent62968038780f3df71e24bfe8ce35d3ace759ab73
parentf85800f30510eba1964088725dea1f635461b084
Merge branch 'MDL-55062_master' of git://github.com/markn86/moodle