Merge branch 'MDL-54900-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 16:53:23 +0000 (18:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 16:53:23 +0000 (18:53 +0200)
commit0efd933a1f79fe8318fe13cf748cf509a757d7f2
tree34eda9327985e3cd98ab768fb824345747497431
parentbc413a6078a031940719e3b89d0d61326cc03058
parent540200aee560f8de036cda5419d7f2b9df04baca
Merge branch 'MDL-54900-master' of git://github.com/marinaglancy/moodle