Merge branch 'wip-MDL-57187-master' of https://github.com/marinaglancy/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 19 Dec 2016 11:46:19 +0000 (12:46 +0100)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 19 Dec 2016 11:46:19 +0000 (12:46 +0100)

Trivial merge