Merge branch 'MDL-50757-master' of git://github.com/damyon/moodle
commit78ebb3481cddf554598b332f57a6b7cc246a00c5
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 3 Jul 2015 09:26:18 +0000 (3 11:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 3 Jul 2015 09:26:18 +0000 (3 11:26 +0200)
treec46c7cd999414fd2fb4214a0cf85e96ee167e420
parente5eefbbf0158318bea91ac7ab83c41671f594d69
parent4359caa22bd5004bec186b5a9f9e477dc7615be1
Merge branch 'MDL-50757-master' of git://github.com/damyon/moodle