Merge branch 'MDL-56155-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Oct 2016 16:10:58 +0000 (17:10 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Oct 2016 16:11:21 +0000 (17:11 +0100)
commit358105b3099858c9dd110f728d8693c7cbfd5659
treeaf9c15bf4dae313b409e930310edae9fb25d67ed
parent9e972b3da45d954cf82447b931440269fa9d561c
parent823ae9f062a591092318d39e2272d17539f2d210
Merge branch 'MDL-56155-master' of git://github.com/lameze/moodle