Merge branch 'MDL-58788-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 May 2017 16:44:38 +0000 (18:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 May 2017 16:44:38 +0000 (18:44 +0200)
commit91edf89d86f5df928072f3e48950e5494c9d4c7a
tree642f528d5d8a916752e81ddc4a4cf217f5b77bd5
parentc201e4df405c8951de118440914e0520a0fe4851
parent69cdead3d12a9ffb4a2a3af2aaf590cbeb84d427
Merge branch 'MDL-58788-master' of git://github.com/danpoltawski/moodle