Merge branch 'MDL-40759-master-fix2' of http://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Mar 2017 09:15:43 +0000 (10:15 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Mar 2017 09:15:43 +0000 (10:15 +0100)

Trivial merge