Merge branch 'wip-mdl-48096' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 07:57:59 +0000 (08:57 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 07:57:59 +0000 (08:57 +0100)

Trivial merge