Merge branch 'wip-mdl-55329' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 9 Aug 2016 06:26:09 +0000 (14:26 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 9 Aug 2016 06:26:09 +0000 (14:26 +0800)

Trivial merge