Merge branch 'MDL-58535-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 3 May 2017 08:41:38 +0000 (16:41 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 3 May 2017 08:41:38 +0000 (16:41 +0800)
commit4d771e8099f140c224337f86daa8a7ba9e51e0f5
treef798ece893d1b8b0fe68e6ea1baa9af651269307
parentd59415222d69a897533cd43f74af8ad38bb5c3c6
parent8eb128120a2786b2d695915215523cbb507200cf
Merge branch 'MDL-58535-master' of git://github.com/damyon/moodle