Merge branch 'MDL-32151-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <david.monllao@gmail.com>
Tue, 27 Jun 2017 15:46:26 +0000 (17:46 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Wed, 28 Jun 2017 16:24:45 +0000 (18:24 +0200)

Trivial merge