Merge branch 'MDL-43794' of https://github.com/merrill-oakland/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 26 Jan 2014 22:16:11 +0000 (11:16 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 26 Jan 2014 22:16:11 +0000 (11:16 +1300)

Trivial merge