Merge branch 'MDL-55866-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Sep 2016 00:29:45 +0000 (02:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Sep 2016 00:29:45 +0000 (02:29 +0200)
commitdf4de02f175fc20f44c5d9db54031e00fd5e9a39
tree0cde5ce92e39ee0854d2c184c6018b1d8cdfef8d
parentccc777032d33946e99cf818440ca9ea6d6d2cbff
parent4e2e54eed07d4537e65e4790fee1f6a335109ed7
Merge branch 'MDL-55866-master' of git://github.com/andrewnicols/moodle