Merge branch 'wip-MDL-54061-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 18 May 2016 08:20:27 +0000 (16:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 18 May 2016 08:20:27 +0000 (16:20 +0800)
commit923b230c8e19024c31409a4213c03d30dd738106
tree1099ee137895b60a69305283b24ec0518f39c26d
parenteface10d303973d7972853fdb270ce2502b2493a
parent759f61fe1ca7ea397aadcc4ad1e17d7476c9a746
Merge branch 'wip-MDL-54061-master' of git://github.com/abgreeve/moodle