Merge branch 'MDL-59198-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Sep 2017 22:34:44 +0000 (00:34 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 Sep 2017 08:50:18 +0000 (10:50 +0200)

Trivial merge