Merge branch 'MDL-56911-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2016 09:33:09 +0000 (10:33 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2016 09:33:09 +0000 (10:33 +0100)

Trivial merge