Merge branch 'MDL-43975-master' of https://github.com/sammarshallou/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 Apr 2014 01:46:28 +0000 (13:46 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 Apr 2014 01:46:28 +0000 (13:46 +1200)

Trivial merge