Merge branch 'MDL-50456-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 7 Jun 2015 19:56:18 +0000 (21:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 7 Jun 2015 19:56:18 +0000 (21:56 +0200)
commit208ebc5cd140b9303e26941fc6dd0b266ccb343b
treeb9cafd0aa5d1a34d238a712b8be83a2c18c7fee9
parent17abbfba1f903888c82044ba6367a4e31375d354
parent2139d7995ba975f88752961bd3ab3639b21546f9
Merge branch 'MDL-50456-master' of git://github.com/damyon/moodle