Merge branch 'MDL-42071_MK3' of https://github.com/merrill-oakland/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 2 Jul 2014 03:13:18 +0000 (15:13 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 2 Jul 2014 03:13:18 +0000 (15:13 +1200)

Trivial merge