Merge branch 'MDL-45654-master' of https://github.com/rtcn2/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 25 May 2014 20:58:03 +0000 (08:58 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 25 May 2014 20:58:03 +0000 (08:58 +1200)

Trivial merge