Merge branch 'MDL-59364-master-fix2' of http://github.com/damyon/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 6 Jul 2017 06:48:05 +0000 (14:48 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 6 Jul 2017 06:48:05 +0000 (14:48 +0800)
commitbdbffe0efc1d5190e864de5de8dec0078920eb26
treedf63bd131b8b069e2a581c5d16abf203d0762b2b
parent11f512ee06b6a8c7866b60f32f9aee9d23be9e9b
parent40f6d247254661863621d407245206e3c5e1ee32
Merge branch 'MDL-59364-master-fix2' of github.com/damyon/moodle