Merge branch 'wip-mdl-56532-fix' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 26 Oct 2016 02:12:25 +0000 (10:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 26 Oct 2016 02:12:25 +0000 (10:12 +0800)

Trivial merge