Merge branch 'wip-mdl-54600' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 May 2016 02:54:45 +0000 (10:54 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 May 2016 09:16:11 +0000 (17:16 +0800)

Trivial merge