Merge branch 'MDL-52952-master-fix' of github.com:xow/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 23 Mar 2016 04:08:32 +0000 (12:08 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 23 Mar 2016 04:08:32 +0000 (12:08 +0800)
commitd137e671f7ebe05a888e2bdeec3248ace82cae70
treea78aace351c42ca5292b9e91bb85f355ee86d69e
parentb5335149f448bec1bfa7f5249adc0570cf24f729
parent94eb96aa7851c69899c2348bb95437d4b01d123d
Merge branch 'MDL-52952-master-fix' of github.com:xow/moodle