Merge branch 'MDL-59556-master' of https://github.com/abias/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 24 Jul 2017 10:35:14 +0000 (12:35 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 24 Jul 2017 10:35:14 +0000 (12:35 +0200)

Trivial merge