Merge branch 'wip-mdl-49659' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 11 Jun 2015 08:56:07 +0000 (09:56 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 11 Jun 2015 08:56:07 +0000 (09:56 +0100)

Trivial merge