Merge branch 'MDL-56677-master' of git://github.com/lameze/moodle
commitd27db408b99676c9a72387847238258b92f2f6af
authorDavid Monllao <davidm@moodle.com>
Wed, 2 Nov 2016 06:55:00 +0000 (2 14:55 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 2 Nov 2016 06:55:00 +0000 (2 14:55 +0800)
tree6690eeddb7b74df59e76e9f8f70241f3c1f7bcce
parent8fa816e0b0a1854704f2f704e235956bf18bc799
parent4bd9a67bf179d2a4e403a30fd3deeb1a980aadf9
Merge branch 'MDL-56677-master' of git://github.com/lameze/moodle