Merge branch 'MDL-56740-master' of git://github.com/danpoltawski/moodle
commit79322e0087d2628c7b53419d453ba679149b2696
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 4 Nov 2016 10:11:32 +0000 (4 11:11 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 4 Nov 2016 10:11:32 +0000 (4 11:11 +0100)
treeb58a9a4a9a150d74b459e174d81a6bb8a9ddb23d
parentac67c97ccb5534706c4313a3a2fe94d3d5e4707e
parent2fe28e0dc30fc7eef557c756140caa3bfdc2d9d8
Merge branch 'MDL-56740-master' of git://github.com/danpoltawski/moodle