Merge branch 'master_MDL-49638' of git://github.com/icefresh89/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Apr 2015 15:24:20 +0000 (16:24 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Apr 2015 15:24:20 +0000 (16:24 +0100)

Trivial merge