Merge branch 'wip-MDL-50586-master-fix' of https://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 17 Aug 2016 05:22:50 +0000 (13:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 17 Aug 2016 05:22:50 +0000 (13:22 +0800)
commit5019f9fd79d3cd0c301b5fa74ae95976a2dcaef3
tree439f395a21f29b528f54b5444026e673b506a0ca
parent72d088f22936136d6b9a85abdefaa3febb60e776
parenta87b2d70ecb8d0e5ea3fb113cee3d83a4987fcf1
Merge branch 'wip-MDL-50586-master-fix' of https://github.com/marinaglancy/moodle