Merge branch 'MDL-58884-master' of git://github.com/StudiUM/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 16 May 2017 02:41:41 +0000 (10:41 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 16 May 2017 02:41:41 +0000 (10:41 +0800)
commit8a0d6655f2180f424e969e060561152b54711123
treed3f9472cfc085e6ac0b94d63978cfbe7e43d5e99
parent9f13573c433da756b8d45347f737d7a5ae2e650b
parent013982e3c4b4f698d35ea48b55230d1f1f31884c
Merge branch 'MDL-58884-master' of git://github.com/StudiUM/moodle