Merge branch 'wip-MDL-4782-fix' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Feb 2017 07:51:02 +0000 (07:51 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Feb 2017 07:51:02 +0000 (07:51 +0000)
commit1fff8332cf4aeafa1f20d4fe379c31d178676aeb
treefadd193220404c8b70d8db6edfa3090c4c739f21
parentc181f152d7290a5ec0fc71bc4d5d325e6ada076c
parent024d120ffc80bcf20cbaa70d9b3e7970048ce47a
Merge branch 'wip-MDL-4782-fix' of https://github.com/marinaglancy/moodle