Merge branch 'MDL-50892-master' of git://github.com/marinaglancy/moodle
commit4deecee44f67702160e752e2eb4d8d27865b2517
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Sep 2015 21:12:22 +0000 (15 23:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Sep 2015 21:12:22 +0000 (15 23:12 +0200)
tree7391951488ce11e8fd795c4ee1ba40155de357dc
parenta16a3592f24789d0aac430052e94d67107b21468
parent278b8d18a29f472d85de0c6a2c9b136f609ec1a0
Merge branch 'MDL-50892-master' of git://github.com/marinaglancy/moodle