Merge branch 'MDL-58796-master' of git://github.com/lameze/moodle
authorJake Dallimore <jake@moodle.com>
Fri, 5 May 2017 04:01:06 +0000 (12:01 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 5 May 2017 04:01:06 +0000 (12:01 +0800)
commit42a123b1b7b646052732ebdd053d118d1e9ba429
tree46cd6ba7dc805a9bfced96e7454e77db6b1ffe27
parent609a10739d969760cd04c0be9cd35537a791fe1e
parent84d4411b01c96de73ee94e8fbb6910654ff6e4cd
Merge branch 'MDL-58796-master' of git://github.com/lameze/moodle