Merge branch 'MDL-51706_master' of https://github.com/jinhofer/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Dec 2015 11:41:39 +0000 (11:41 +0000)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 10:11:06 +0000 (11:11 +0100)

Trivial merge