Merge branch 'wip-mdl-50116' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 May 2015 07:27:49 +0000 (08:27 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 19 May 2015 07:27:49 +0000 (08:27 +0100)

Trivial merge