Merge branch 'wip-mdl-49799-m' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 20 Apr 2015 04:22:18 +0000 (12:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 20 Apr 2015 04:22:18 +0000 (12:22 +0800)

Trivial merge