Merge branch 'MDL-45991_master' of https://github.com/Syxton/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 14 Jul 2014 03:19:21 +0000 (15:19 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 14 Jul 2014 03:19:21 +0000 (15:19 +1200)

Trivial merge