Merge branch 'MDL-55348-master' of git://github.com/dpalou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 14:48:26 +0000 (16:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 14:48:26 +0000 (16:48 +0200)
commit03961256d1ce2f39f9a84173496f0eb44331c06d
tree9a6ac642343049075686e28bf6ae90111256f97f
parent8ea6cc2455446c6e3c4bc5c64f289a3a90cb848c
parent3b40103c2fc449c60be770a291dece065b70d378
Merge branch 'MDL-55348-master' of git://github.com/dpalou/moodle