Merge branch 'MDL-59661_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Aug 2017 23:41:29 +0000 (01:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Aug 2017 23:41:29 +0000 (01:41 +0200)
commit2345ae252ebc53a447d30ad84451978a58c82b37
treee280d9a1ae02fe2ba110852104c9f704b8776087
parenteb2e291716651e8c07a9b5c024d11f3a2175faa3
parentd126f838066758d89e8d63ed2dc5802039520e8f
Merge branch 'MDL-59661_master' of git://github.com/dmonllao/moodle