Merge branch 'MDL-59296-master' of git://github.com/crazyserver/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jun 2017 09:37:52 +0000 (11:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jun 2017 09:37:52 +0000 (11:37 +0200)
commitce836829e6c0ae7f4e0b2419f813de6bd18678b0
tree4aea41aa0f07bc457b09fe635df72ad06bff1e8a
parente2aa2f25f1e4546076e273f6f19a9a18c43d435d
parent43cf2cb0a486588c4af26b309caebfee749a2b37
Merge branch 'MDL-59296-master' of git://github.com/crazyserver/moodle