Merge branch 'MDL-50557-master' of git://github.com/jleyva/moodle
commit115c5270ccf63744bacad2c9de5f605ef7c0f7ec
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Sep 2015 21:24:39 +0000 (16 23:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Sep 2015 21:24:39 +0000 (16 23:24 +0200)
treeb0d6b1e9e39ef4934278930193f3265087f6d6fd
parent6c9872941e3ccd63612fdf737497abb14b16e307
parent35219d8bb9ade532de4351e16a34add01fc4353a
Merge branch 'MDL-50557-master' of git://github.com/jleyva/moodle