Merge branch 'MDL-59784-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE
commita35a27e8190ec137690c4028b5608b95a71d827e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Aug 2017 10:28:44 +0000 (22 12:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Aug 2017 10:28:44 +0000 (22 12:28 +0200)
tree7b9173a189a5188a5fbdfcb2306ffbb5d30ee086
parent69c4972afbb9832c5396855066a462341fb204bb
parent1896e257aafca9f1c17904bdb673a8b2d16fd8fa
Merge branch 'MDL-59784-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE