Merge branch 'MDL-58493-master' of git://github.com/damyon/moodle
authorDavid Monllao <david.monllao@gmail.com>
Thu, 13 Apr 2017 09:36:54 +0000 (11:36 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Thu, 13 Apr 2017 09:36:54 +0000 (11:36 +0200)

Trivial merge