Merge branch 'MDL-54607-master' of git://github.com/ankitagarwal/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 17 Jul 2017 07:31:53 +0000 (09:31 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 17 Jul 2017 07:31:53 +0000 (09:31 +0200)

Trivial merge