Merge branch 'MDL-52887-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 14:13:25 +0000 (16:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 14:13:25 +0000 (16:13 +0200)
commitbc413a6078a031940719e3b89d0d61326cc03058
tree08360da1e3b1da66120585e3d2896b7f6f3ee7a9
parentf780baf0634790f81b85011d5f0143412300a6a4
parentdcd320b5addf11f7c7d9eddae9cc0baf50b98b69
Merge branch 'MDL-52887-master' of git://github.com/marinaglancy/moodle