Merge branch 'master_MDL-48419' of https://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 23 Mar 2015 11:15:55 +0000 (11:15 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Mar 2015 11:15:55 +0000 (11:15 +0000)

Trivial merge