Merge branch 'master_MDL-49303' of https://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Mar 2015 16:57:52 +0000 (16:57 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Mar 2015 16:57:52 +0000 (16:57 +0000)

Trivial merge