Merge branch 'MDL-46240-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Jul 2014 22:34:28 +0000 (10:34 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Jul 2014 22:34:28 +0000 (10:34 +1200)

Trivial merge