Merge branch 'MDL-54671-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jul 2016 16:14:17 +0000 (18:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jul 2016 16:14:17 +0000 (18:14 +0200)
commit5748e56242a166f71ae874f6a97eef9e314a436a
treec1b1d213e0ad630a4f0fe27c732331eb9d24186d
parent731f2989c9d2d80cd6abb0b9c4ae29ed8d811a8b
parentd7f2176fd862ad2671580f629e6656ce5b60dcb6
Merge branch 'MDL-54671-master' of git://github.com/danpoltawski/moodle