Merge branch 'MDL-52511-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Feb 2016 01:00:37 +0000 (02:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Feb 2016 01:00:37 +0000 (02:00 +0100)
commit056a07388b7b16e85cb2d7ae2648bd3a32f4510f
tree62cfc35dcd856eef02e91ad115b24b48470c2232
parentc06749bdf3197550f0d2b5be0a32efe9956eb7ee
parent267ac1b9ebf04c5dbbc5e9b2307f321385241ee1
Merge branch 'MDL-52511-master' of git://github.com/danpoltawski/moodle