Merge branch 'MDL-52879' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 16 Feb 2016 10:26:57 +0000 (10:26 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Feb 2016 10:26:57 +0000 (10:26 +0000)

Trivial merge