Merge branch 'MDL-56436-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 09:21:31 +0000 (11:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 09:21:31 +0000 (11:21 +0200)
commit8e132134274110e91d78c3bbe442fc9367a2c40e
treea958973fcb4f9ecfb3aabd61fd4acc083241a1ec
parentd244cf1fd732fa969ab3afd0ace2f1c74554b8e7
parentf60c7eae73b9dff2d1f56f8ec0a68b03220b46f5
Merge branch 'MDL-56436-master' of git://github.com/danpoltawski/moodle