Merge branch 'MDL-56417_master' of https://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 11 Nov 2016 03:53:41 +0000 (11:53 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 11 Nov 2016 03:53:41 +0000 (11:53 +0800)
commit6b7b3e59f2a47bc16eed6152acadd8e4c2e83647
treeff2083e366dd875af934e8ac0d9046272edefc57
parent06cca0158c9e300d60d90a65c5663857e8d456e6
parentb86c685075ff3dd7b3b5c2e9494c80f11e7f3796
Merge branch 'MDL-56417_master' of https://github.com/dmonllao/moodle