Merge branch 'MDL-42071_MK3' of https://github.com/merrill-oakland/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 30 Jun 2014 23:27:53 +0000 (11:27 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 30 Jun 2014 23:27:53 +0000 (11:27 +1200)

Trivial merge