Merge branch 'MDL-57192-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 Jan 2017 10:58:46 +0000 (11:58 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 4 Jan 2017 11:34:01 +0000 (11:34 +0000)
commit41af8a5f903033bc40dee0820e574eeb8d5426d3
treebd27f204a7da177ffeb33478f2ad86daa166e829
parent1af801be98ee919870d5e773591648f585244cac
parentc728b45904fd76d10e71d361eab96b6bb1f0cae6
Merge branch 'MDL-57192-master' of git://github.com/ankitagarwal/moodle