Merge branch 'MDL-56316-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Oct 2016 16:11:56 +0000 (18:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Oct 2016 16:11:56 +0000 (18:11 +0200)
commitf0077d4c42136a8ae17bd14316f6a8005e207058
treedf37246b8aab4c7de683722f380b6ae7002a7ac1
parent6a8f40c394509ba0b9f2fcf534b24a5f4b280c5e
parent070015004e77eb3c02303ee7ed153663aadba26b
Merge branch 'MDL-56316-master' of git://github.com/andrewnicols/moodle