Merge branch 'MDL-45765-master' of https://github.com/StudiUM/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 14 Jul 2014 00:09:29 +0000 (12:09 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 14 Jul 2014 00:09:29 +0000 (12:09 +1200)

Trivial merge