Merge branch 'wip-MDL-50887-master' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 2 Mar 2016 07:49:45 +0000 (15:49 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 2 Mar 2016 07:49:45 +0000 (15:49 +0800)
commit852f32f7b3e11570e38adc7755c72a76ef5b2b31
treeddcfa7a6a9c1bb8d8efad8adf126761f3d62096c
parent3247e9ef4b942b491012b8123e987468ef650a1d
parentd2de503c805123869fc9d93841dd3afdf4b83192
Merge branch 'wip-MDL-50887-master' of https://github.com/marinaglancy/moodle