Merge branch 'MDL-42071_MK3' of https://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Jul 2014 14:41:04 +0000 (15:41 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Jul 2014 14:41:04 +0000 (15:41 +0100)

Trivial merge