Merge branch 'wip-mdl-47676-m' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 27 Oct 2014 07:47:07 +0000 (07:47 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 27 Oct 2014 07:47:07 +0000 (07:47 +0000)

Trivial merge