Merge branch 'MDL-59153_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Sep 2017 09:03:04 +0000 (10:03 +0100)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 Sep 2017 08:46:56 +0000 (10:46 +0200)
commit3c4675a00291b5bcc9634f8b5db7270d6f44993a
treed73f68d4fc17a64e48f743868c5b77c2ac34e2cc
parent30375ee99f6b3eda8f8b9960a6c857bdd55a9173
parent1d5b1d0111475eb8d166b834c2e0ca3606cfe615
Merge branch 'MDL-59153_master' of git://github.com/dmonllao/moodle