Merge branch 'MDL-57812-master' of git://github.com/jleyva/moodle
commitec116fe6766b378987de41b50d694ca44d5493de
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Mar 2017 11:35:43 +0000 (20 12:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Mar 2017 11:35:43 +0000 (20 12:35 +0100)
tree1ce87c8e1f25c306281efe4efba962824376e01d
parent5de6c5dc3bf986604255ebfe3ca818a0032d4ade
parent3f62cbd33e0faeda3aa2d3ebcd41801b0fa8d54a
Merge branch 'MDL-57812-master' of git://github.com/jleyva/moodle