Merge branch 'MDL-60763-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Fri, 10 Nov 2017 05:57:04 +0000 (13:57 +0800)
committerDamyon Wiese <damyon@moodle.com>
Fri, 10 Nov 2017 05:57:04 +0000 (13:57 +0800)
commitf738fc8efd0f5c4b961dbb0a30def6184dd406d5
treeb03400bfd71acc1dc844ad1d04cf03753a02f3ca
parent319243807532b0bdcdcbcb73885848e0950cea1c
parent27973b545cc26ad021808bd03d5886b729a3fb00
Merge branch 'MDL-60763-master' of git://github.com/andrewnicols/moodle