Merge branch 'MDL-50798-master' of git://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Jul 2015 12:35:14 +0000 (13:35 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Jul 2015 12:35:14 +0000 (13:35 +0100)
commit218936aecc29e457b0d58c3ad900f1f123845d28
tree1ab58fa0be0a7f115179aee62f5f673f4df02377
parentda52ce53b6caaee4315d33fc07e9052801e0969f
parentc7092fe48939c310f040c392d00e791df71eb9d2
Merge branch 'MDL-50798-master' of git://github.com/merrill-oakland/moodle