Merge branch 'MDL-45535-master' of https://github.com/sammarshallou/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 May 2014 23:55:35 +0000 (11:55 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 May 2014 23:55:35 +0000 (11:55 +1200)

Trivial merge