Merge branch 'MDL-57139-master' of git://github.com/danpoltawski/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 7 Jun 2017 06:36:13 +0000 (14:36 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 7 Jun 2017 06:36:13 +0000 (14:36 +0800)
commit953df3696410e80aeba76305b6b652f71952f3c8
treef66482e812d657746a7bd7c58acc2c9dea918ae9
parent3a0bd9d95a60cdf0e274100072423f780ad5fdfa
parentafaa33d9e124e18fe601929f4cf170848f946c01
Merge branch 'MDL-57139-master' of git://github.com/danpoltawski/moodle