Merge branch 'wip-mdl-48302' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Nov 2014 11:56:56 +0000 (11:56 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Nov 2014 11:56:56 +0000 (11:56 +0000)

Trivial merge