Merge branch 'wip-mdl-48032-m' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Nov 2014 11:32:04 +0000 (11:32 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Nov 2014 11:32:04 +0000 (11:32 +0000)

Trivial merge