Merge branch 'master_MDL-47404' of https://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 01:23:18 +0000 (14:23 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 01:23:18 +0000 (14:23 +1300)

Trivial merge