Merge branch 'wip-MDL-46960-master' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 08:55:08 +0000 (09:55 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 08:55:08 +0000 (09:55 +0100)

Trivial merge