Merge branch 'MDL-52653-master' of http://github.com/damyon/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 23 Oct 2017 05:14:03 +0000 (13:14 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 23 Oct 2017 05:14:03 +0000 (13:14 +0800)
commit032bda879ceb780514e40e19bf65020e28eb01ab
tree0c56d9ebb00b1c8717e198e923eeba6e1f970304
parent01df2313c09befcaff3899c39be741f6b85aaba8
parentb233630c93d9d0d65627f8a246ab1a1b717778dc
Merge branch 'MDL-52653-master' of github.com/damyon/moodle