Merge branch 'MDL-45635-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 25 May 2014 22:36:11 +0000 (10:36 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 25 May 2014 22:36:11 +0000 (10:36 +1200)

Trivial merge