Merge branch 'MDL-55964_master' of https://github.com/StudiUM/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 3 Oct 2016 04:40:25 +0000 (12:40 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 3 Oct 2016 04:40:25 +0000 (12:40 +0800)
commitdae538606f40379b0634bb9a84c2813a12f842af
treea9db6bd668c03f3f8eab1acf318765afd2840359
parentc31610afdef3710314749a3493082914bdb28d26
parentceee6e9bd831761789faa91096bf7237cc981f02
Merge branch 'MDL-55964_master' of https://github.com/StudiUM/moodle