Merge branch 'wip-mdl-56189' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 11 Nov 2016 06:07:10 +0000 (14:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 11 Nov 2016 06:07:10 +0000 (14:07 +0800)

Trivial merge