Merge branch 'MDL-49755' of git://github.com/mr-russ/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Apr 2015 16:45:56 +0000 (17:45 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Apr 2015 16:45:56 +0000 (17:45 +0100)

Trivial merge