Merge branch 'wip-mdl-52230' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 10 Aug 2016 01:53:24 +0000 (09:53 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 10 Aug 2016 01:53:24 +0000 (09:53 +0800)

Trivial merge