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

Trivial merge