Merge branch 'wip-MDL-55939-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 10 Apr 2017 10:57:34 +0000 (12:57 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 10 Apr 2017 10:57:34 +0000 (12:57 +0200)

Trivial merge