Merge branch 'MDL-57319-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Dec 2016 15:23:14 +0000 (16:23 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Dec 2016 15:23:14 +0000 (16:23 +0100)
commit00759c909cbda049b7b00a50efc75fc3706e02d3
tree65d485555c6bfffd087d074e5a50f614e62a0407
parente36d9b3ead31569f2e5f394435f5cf0e01523e18
parent1081de20e11d2bfb9b55a4cb32be10e1f30a667c
Merge branch 'MDL-57319-master' of git://github.com/danpoltawski/moodle