Merge branch 'MDL-45841' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Sep 2015 09:14:45 +0000 (10:14 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Sep 2015 09:14:45 +0000 (10:14 +0100)

Trivial merge