Merge branch 'MDL-49582-master' of https://github.com/lucisgit/moodle
commit8bdb261a319e24ac7042f3cd5eb20e23fe20b71a
authorDan Poltawski <dan@moodle.com>
Mon, 20 Jul 2015 07:23:22 +0000 (20 08:23 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Jul 2015 07:23:22 +0000 (20 08:23 +0100)
tree41826a523e31021a0021abcf5d7cd3e2bf112408
parente1d4e288ac183f7259798ed8fc2625507a6c481f
parentbf7c844e941df51d3bfd4768f24ca4ee8a72e6fe
Merge branch 'MDL-49582-master' of https://github.com/lucisgit/moodle