Merge branch 'MDL-48756-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Jun 2016 10:49:39 +0000 (11:49 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Jun 2016 10:49:39 +0000 (11:49 +0100)

Trivial merge