Merge branch 'MDL-45603-master' of https://github.com/merrill-oakland/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 May 2014 01:59:23 +0000 (13:59 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 May 2014 01:59:23 +0000 (13:59 +1200)

Trivial merge