Merge branch 'wip-mdl-49974' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 28 Apr 2015 14:01:08 +0000 (15:01 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 28 Apr 2015 14:01:08 +0000 (15:01 +0100)

Trivial merge