Merge branch 'MDL-53660-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Apr 2016 23:19:58 +0000 (01:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Apr 2016 23:19:58 +0000 (01:19 +0200)
commit3a97e398257fd3ac8c6a021a18b589972b313859
tree1204ba50df69d93d68e05a66258092584767a6c6
parent4384d72024622d75936b5058e24c869d79f8cc5e
parent39b2d8700d89cf08004bd3c03cd90545961bce9c
Merge branch 'MDL-53660-master' of git://github.com/danpoltawski/moodle