Merge branch 'MDL-51578' of git://github.com/blaky/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 10:40:20 +0000 (11:40 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:31:35 +0000 (16:31 +0100)

Trivial merge