Merge branch 'MDL-58079_master' of https://github.com/kiklop74/moodle
authorDavid Monllao <david.monllao@gmail.com>
Tue, 28 Mar 2017 15:30:40 +0000 (17:30 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Tue, 28 Mar 2017 15:30:40 +0000 (17:30 +0200)

Trivial merge