Merge branch 'MDL-42909-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 20 Jul 2014 23:35:47 +0000 (11:35 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 20 Jul 2014 23:35:47 +0000 (11:35 +1200)

Trivial merge