Merge branch 'MDL-58244-master' of https://github.com/MartinGauk/moodle
authorDavid Monllao <david.monllao@gmail.com>
Thu, 13 Apr 2017 10:58:23 +0000 (12:58 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Thu, 13 Apr 2017 10:58:23 +0000 (12:58 +0200)

Trivial merge