Merge branch 'MDL-56972-master' of https://github.com/snake/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Nov 2016 01:05:40 +0000 (09:05 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Nov 2016 01:05:40 +0000 (09:05 +0800)
commitf48cc821db06fe99715c6e17c043117856dd0c17
tree7436a62385ae579757ad77e1d5806f27fd21d5cf
parent5084343b3fc47333c8092b4d2aee8bcec113a91b
parentfe9864f48884dd73646ff03bc29334fd215e9aa4
Merge branch 'MDL-56972-master' of https://github.com/snake/moodle