Merge branch 'wip-MDL-56829-master-2' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 30 Nov 2016 02:05:16 +0000 (10:05 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 30 Nov 2016 02:05:16 +0000 (10:05 +0800)
commit8c291fb06ea8e06c83299d621f5ea9ce5bcf3d41
tree4ce7d5efe4090cbf780003c4a787eb3a458806f8
parent449b730e09b20996f294cce87e39d4422078ee9c
parent7d94f001e22efc0a3e52eebb75acef4136925923
Merge branch 'wip-MDL-56829-master-2' of git://github.com/marinaglancy/moodle