Merge branch 'MDL-9873' of https://github.com/merrill-oakland/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 3 Oct 2013 19:25:58 +0000 (08:25 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 3 Oct 2013 19:25:58 +0000 (08:25 +1300)

Trivial merge