Merge branch 'MDL-51242-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 25 Jul 2016 18:40:35 +0000 (02:40 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 25 Jul 2016 18:40:35 +0000 (02:40 +0800)
commit854695ee3f9562a3ee76488d3a00b066f65a4bca
tree3e0ddba41106c145b818757b41beb85a01b64ae4
parent5d21ea9d3b2ac3a041b03b4185b2fd02ef80ad55
parent275480a0dec96ae57f4af49643757131320530cd
Merge branch 'MDL-51242-master' of git://github.com/andrewnicols/moodle