Merge branch 'master_MDL-48096' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 30 Mar 2015 12:48:35 +0000 (13:48 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Mar 2015 12:48:35 +0000 (13:48 +0100)

Trivial merge