Merge branch 'MDL-50273-master' of git://github.com/danpoltawski/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 30 May 2017 11:21:35 +0000 (19:21 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 30 May 2017 11:21:35 +0000 (19:21 +0800)
commit8334c8a0a081dca719dd18996bd699595d883c4a
treed1b9d2716b391c89d5b10986015e9586801147f4
parent6ed955f16c7622193594d7823a1561377d613a80
parent53ca9cc890d7987cda819e34db5f3dd8cb1d9e7e
Merge branch 'MDL-50273-master' of git://github.com/danpoltawski/moodle