Merge branch 'MDL-58684-master-2' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 4 May 2017 02:14:41 +0000 (10:14 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 4 May 2017 02:14:41 +0000 (10:14 +0800)
commit680ad78cf074387dbb3834e98a70c7a9460715c9
tree671e503c6e1ab0d620cc43797da18d374b838c88
parentb1517237ad3da5ad872a5916aa074ac9d2c9b785
parent5529b4701aa52caf30a25052ba90aaa7b7dc0ef7
Merge branch 'MDL-58684-master-2' of https://github.com/snake/moodle