Merge branch 'MDL-54769-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Jun 2016 21:56:25 +0000 (23:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Jun 2016 21:56:25 +0000 (23:56 +0200)
commit512f9def5c2efe0c7e0b2d933b382edba1bb8a4e
treed5b50c54603961a79afb0224ea2ffd071e624423
parentccbb50d2e2e3a64b61bfdbe7541bc07adac00321
parent88038050b14d166a854b4906152d4d7796b411c8
Merge branch 'MDL-54769-master' of git://github.com/marinaglancy/moodle