Merge branch 'wip-mdl-52970' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 22 Feb 2016 07:20:34 +0000 (15:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 22 Feb 2016 07:20:34 +0000 (15:20 +0800)

Trivial merge