Merge branch 'MASTER_MDL-53306' of https://github.com/jacac/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Jun 2016 15:55:26 +0000 (16:55 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:10 +0000 (09:04 +0100)
commit134e4566ff0e12070b0549b5f79e8d19724c09a2
tree27b928a842f4ec16a512c0f806cfedff473c0096
parent435fb1381416e5ce12182747ea16653567b5b13d
parentcffd0fa138345e8143919e261ba693dac646f576
Merge branch 'MASTER_MDL-53306' of https://github.com/jacac/moodle