Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 10 Oct 2013 03:06:40 +0000 (16:06 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 10 Oct 2013 03:06:40 +0000 (16:06 +1300)

Trivial merge