Merge branch 'MDL-51410_m30v2' of https://github.com/sbourget/moodle into MOODLE_30_S...
commitda0d992d2032b932b695e7b4821387e0c4be221e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jul 2016 00:31:40 +0000 (19 02:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jul 2016 00:31:40 +0000 (19 02:31 +0200)
tree999a8b011e4f3d864a3c5bef4073b07afffa4ce2
parent32d225deab67b2b6380adc0fc835bd9dc156ea5b
parent27f6cc451983353181e040f86005f2a830beb7ff
Merge branch 'MDL-51410_m30v2' of https://github.com/sbourget/moodle into MOODLE_30_STABLE