Merge branch 'master_MDL-46363' of https://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 20 Jul 2014 22:45:33 +0000 (10:45 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 20 Jul 2014 22:45:33 +0000 (10:45 +1200)

Trivial merge