Merge branch 'MDL-52042-master' of git://github.com/ryanwyllie/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 30 Nov 2015 13:20:35 +0000 (13:20 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Nov 2015 13:20:35 +0000 (13:20 +0000)
commit1db15fe9a7699e012d96d8309fff0f5513b79db0
tree2eb90d7a0fcba036ce460214cee3b4570239769a
parentc2c97208f15b0e06359bf629fd40e7143e55cb53
parente1db2b4112988cbc4a319e1845c99f140080045d
Merge branch 'MDL-52042-master' of git://github.com/ryanwyllie/moodle