Merge branch 'MDL-50732_composerFix' of https://github.com/moodlerooms/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Jul 2015 12:41:15 +0000 (13:41 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Jul 2015 12:41:15 +0000 (13:41 +0100)

Trivial merge