Merge branch 'MDL-41933' of https://github.com/merrill-oakland/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Oct 2013 01:06:28 +0000 (14:06 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Oct 2013 01:06:28 +0000 (14:06 +1300)

Trivial merge