Merge branch 'wip-mdl-50203' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 May 2015 11:38:56 +0000 (12:38 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 19 May 2015 11:38:56 +0000 (12:38 +0100)

Trivial merge