Merge branch 'MDL-54074-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 May 2016 03:22:37 +0000 (11:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 May 2016 03:22:37 +0000 (11:22 +0800)
commitccf89705febb0d2f73eff021038a10ff8efc5f49
tree6dbddd48a380701bd845ad3bbe60b4d498574aea
parentf092c0881dc6c7e2611c80ba3dfdca23a2fe08de
parentb5a3118ddbc01464f9622a80c9bdc2f192b3da37
Merge branch 'MDL-54074-master' of git://github.com/FMCorz/moodle