Merge branch 'MDL-32596_master' of https://github.com/rezaies/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 13 Apr 2017 14:58:00 +0000 (15:58 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 13 Apr 2017 14:58:00 +0000 (15:58 +0100)
commit0c290ad191a8c0bcfbf5a012d97998840395fc80
tree147a5a4087636ebe207f2803d8133f2d926e669f
parentca7de06cf308f5b45e614b70b5228fc05358a5e4
parent74f83c14ee17a8601d71027d74e90080fd1eab76
Merge branch 'MDL-32596_master' of https://github.com/rezaies/moodle