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

Trivial merge