Merge branch 'MDL-52226_master-fix' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Dec 2015 08:31:55 +0000 (08:31 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Dec 2015 08:31:55 +0000 (08:31 +0000)
commit5cbc9819fdd75b44e4e5f50e710c67bed452e272
treebceb52fc39aadc099e65b0046858fa700fcea6f4
parentf08d1590c814857f263209ccad9211a15f60b7ae
parenta49fd98349d546dff4b55ef262938e6550e04c84
Merge branch 'MDL-52226_master-fix' of git://github.com/dmonllao/moodle