Merge branch 'MDL-58788-31' of git://github.com/danpoltawski/moodle into MOODLE_31_STABLE
commit315214fd8038aa8bbdeb6f288df66006355f8d5b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 May 2017 17:06:13 +0000 (3 19:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 May 2017 17:06:13 +0000 (3 19:06 +0200)
tree462f4bfd69b45d36a6db566fb2d10aa32459e315
parent08ff55dad7355cece2f8b65d7f201f10d63b8c39
parent04f5ebb886e4902886be1e90b93e02d63c0dff78
Merge branch 'MDL-58788-31' of git://github.com/danpoltawski/moodle into MOODLE_31_STABLE