Merge branch 'MDL-56072-master' of git://github.com/cameron1729/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 28 Sep 2016 00:37:48 +0000 (08:37 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 28 Sep 2016 00:37:48 +0000 (08:37 +0800)
commitbdab41d71b45d7bc8ca8ae032d96d607a17045ea
treeac00c7c7caba924cd67becbf33b9954ebdb69447
parentdf4de02f175fc20f44c5d9db54031e00fd5e9a39
parent676e5dcdccad8099807bd5895de36cdaedf1bf10
Merge branch 'MDL-56072-master' of git://github.com/cameron1729/moodle