Merge branch 'MDL-49070_scheduled' of https://github.com/andyjdavis/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 24 Mar 2015 13:33:38 +0000 (13:33 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 24 Mar 2015 13:33:38 +0000 (13:33 +0000)

Trivial merge