Merge branch 'wip-mdl-48174' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 12 Nov 2014 11:03:43 +0000 (11:03 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 12 Nov 2014 11:03:43 +0000 (11:03 +0000)

Trivial merge