Merge branch 'MDL-49560-master' of git://github.com/gurgus/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 26 May 2015 10:33:26 +0000 (11:33 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 26 May 2015 10:33:26 +0000 (11:33 +0100)

Trivial merge