Merge branch 'MDL-52095_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Nov 2015 18:29:35 +0000 (19:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Nov 2015 18:29:35 +0000 (19:29 +0100)
commit6842738157bc2085acfd0d65aa2df0260ac0631c
tree713092484042f8d1f14d08a697d6325d18a2688c
parent11780411c64df83d558c01acff754c076725c553
parent2af06c4cba0de9b57af72dcd6e52185bcbb88143
Merge branch 'MDL-52095_master' of git://github.com/dmonllao/moodle