Merge branch 'MDL-55167-master' of git://github.com/danpoltawski/moodle
commitf31c65d784b91a36a16467fff7f62502171d2517
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 17:54:00 +0000 (2 19:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 17:54:00 +0000 (2 19:54 +0200)
tree5322801dc285ecdf4bddb6016209031d52586822
parent648bbbbbd051cc107798a100e7771852621cfd02
parent091a1f9290e9b26a6006033b17380ddfad4dacc0
Merge branch 'MDL-55167-master' of git://github.com/danpoltawski/moodle