Merge branch 'master_MDL-44548' of https://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 10:45:22 +0000 (11:45 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 10:45:22 +0000 (11:45 +0100)

Trivial merge