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

Trivial merge