Merge branch 'MDL-56254-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 10 Oct 2016 05:01:40 +0000 (13:01 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 10 Oct 2016 05:01:40 +0000 (13:01 +0800)
commit96d2a6fd5ff59cff2472ebe209d5db6a99143661
treee398550e2e56e2ffe6b00278897d05cf58e4d11c
parentfae446b9cb9dcbccee098175ec963f941c9c3b8b
parent98f1034ccd8f27848872bc990979e54c42977e84
Merge branch 'MDL-56254-master' of git://github.com/FMCorz/moodle