Merge branch 'MDL-57293-master' of git://github.com/danpoltawski/moodle
commite857608ba23afce77844316afc5afe8e2db9c40a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Dec 2016 12:02:09 +0000 (19 13:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Dec 2016 12:02:09 +0000 (19 13:02 +0100)
tree240c8354d65f16ff2f1e99d994aefd8a9d279ff7
parenta127f448f0b127676ce0ff566db8b9f8a881a6c8
parentd0e61e86552d11abc2760a0801d5c83edeed3305
Merge branch 'MDL-57293-master' of git://github.com/danpoltawski/moodle