Merge branch 'wip-mdl-50647' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 16 Oct 2015 03:16:36 +0000 (11:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 16 Oct 2015 03:16:36 +0000 (11:16 +0800)

Trivial merge