Merge branch 'MDL-56538-master' of git://github.com/crazyserver/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Oct 2016 14:50:55 +0000 (15:50 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Oct 2016 14:50:55 +0000 (15:50 +0100)
commitb5c5d741c481af3f10350cff4497ad48bd12ee30
tree904e3911bf82e45ae7c8271a8d515b3bb01bacae
parentb37895a13a54fcea59b301ab02d3198a742e281e
parent896b6e3cb0b53be6d4e4831582fb872aed94a61f
Merge branch 'MDL-56538-master' of git://github.com/crazyserver/moodle