Merge branch 'wip-MDL-58364-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <david.monllao@gmail.com>
Thu, 6 Apr 2017 07:30:45 +0000 (09:30 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Thu, 6 Apr 2017 07:30:45 +0000 (09:30 +0200)

Trivial merge