Merge branch 'MDL-59942-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 25 Oct 2017 13:14:54 +0000 (15:14 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 25 Oct 2017 13:14:54 +0000 (15:14 +0200)
commit4f7a80341ea45c04f7b25200c4dbd5bef9603a1e
tree83bce8aa2f71df8ba432e0f89b162af5c7abcfdc
parent3b4e9a9fc852f7979b20e5f7733bdc5036eec18a
parent79dff18711a3a5b2a626660792b881c474f30e8c
Merge branch 'MDL-59942-master' of git://github.com/andrewnicols/moodle