Merge branch 'master_MDL-49557' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Jan 2017 12:35:11 +0000 (12:35 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Jan 2017 12:35:11 +0000 (12:35 +0000)
commit00e741af48b8e5430bca1c123c395bd4d611c572
tree6274e7c16566d076a22ad94018900db4cd1c7684
parent241473ce2eaa731f1b922d1def2a4d73125a85d3
parent39eee56fa6251ed89217dff971608a0257190ec9
Merge branch 'master_MDL-49557' of git://github.com/danmarsden/moodle