Merge branch 'MDL-56631-master' of git://github.com/damyon/moodle
commit75de2e619930bfc1d720155c33fda9c7816e2abf
authorDan Poltawski <dan@moodle.com>
Mon, 31 Oct 2016 09:10:06 +0000 (31 09:10 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 31 Oct 2016 09:10:06 +0000 (31 09:10 +0000)
tree4074f7d48cd121c07684399b5a0fa81e3fe7d22f
parent0b030406052c1d7efb6c75fe298870103e8f704f
parentad785e699e8edb48db31a09caa7e919ac8c2a91c
Merge branch 'MDL-56631-master' of git://github.com/damyon/moodle