Merge branch 'MDL-60048-master' of https://github.com/Kathrin84/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 19 Sep 2017 09:21:40 +0000 (17:21 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 19 Sep 2017 09:21:40 +0000 (17:21 +0800)

Trivial merge