Merge branch 'wip-mdl-52721' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jan 2016 14:39:46 +0000 (14:39 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jan 2016 14:39:46 +0000 (14:39 +0000)

Trivial merge