Merge branch 'MDL-60372-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 19 Oct 2017 02:20:39 +0000 (15:20 +1300)
committerJun Pataleta <jun@moodle.com>
Thu, 19 Oct 2017 02:20:39 +0000 (15:20 +1300)
commit4ee428fbe2923b2a7b12c1bbb7be9cf717cc9428
treeac072c5091d5231722a65711ae7c9290d39728c9
parentff7081150b577adbec4df32ee3fb2ff98e740671
parent28b77ce6c78ecec47e7183c4a373333e997ba7ac
Merge branch 'MDL-60372-master' of git://github.com/lameze/moodle