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)
commita1333dd3a3de867c4e094842aa769083396a96d2
treec0bd4536305a57a8260170b6fd7672d5f12bf885
parent218936aecc29e457b0d58c3ad900f1f123845d28
parenta256eddbc3ba05d1fa92e42720799ee693e790f6
Merge branch 'MDL-50732_composerFix' of https://github.com/moodlerooms/moodle