Merge branch 'master_MDL-49647' of https://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Jul 2015 09:05:27 +0000 (10:05 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Jul 2015 09:05:27 +0000 (10:05 +0100)

Trivial merge