Merge branch 'MDL-51929-master' of git://github.com/dpalou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Feb 2016 10:22:53 +0000 (11:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Feb 2016 10:22:53 +0000 (11:22 +0100)
commit5d8dfdef1d4276894a0e7e666f28482e45818d65
treeda4c19e7203ac0367c2e2cae5cc4dd03281f0c56
parent6bb1bd930f70c010095a6576d84cf1c6f11855f6
parent052da7304a76a7b76248cf578c934de121db1638
Merge branch 'MDL-51929-master' of git://github.com/dpalou/moodle