Merge branch 'MDL-44172-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jan 2017 18:37:17 +0000 (19:37 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jan 2017 18:37:17 +0000 (19:37 +0100)
commit2a3341c2dcca4e337c11089e6a0de263b5f035da
tree7e59976848f8a635398a40561a6ea107b58b1dd6
parent06f33c6a86777e80de23a1a82e465ebceba10c02
parentce20d61aa7cee87934c6d1c7c917e1d6d1b60c04
Merge branch 'MDL-44172-master' of git://github.com/danpoltawski/moodle