Merge branch 'MDL-44046' of https://github.com/merrill-oakland/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 9 Feb 2014 20:28:08 +0000 (09:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 9 Feb 2014 20:28:08 +0000 (09:28 +1300)

Trivial merge