Merge branch 'MDL-56691-master' of git://github.com/damyon/moodle
commit205577718b60945f27ee9253ff709c90bed45de1
authorDavid Monllao <davidm@moodle.com>
Thu, 3 Nov 2016 00:22:25 +0000 (3 08:22 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 3 Nov 2016 00:22:25 +0000 (3 08:22 +0800)
tree9f8efd222f724733deb65cde11c4bde3f378c401
parent56f763b1f92607043916e19d6da51de8e0b0e8dc
parent6ec7fb8dc14486413d6ca04682b579c70f5b9499
Merge branch 'MDL-56691-master' of git://github.com/damyon/moodle