Merge branch 'MDL-57762-master' of git://github.com/jleyva/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 27 Mar 2017 11:31:29 +0000 (13:31 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 27 Mar 2017 11:31:29 +0000 (13:31 +0200)

Trivial merge