Merge branch 'MDL-57791_master-fix5' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 27 Jul 2017 06:23:52 +0000 (14:23 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 27 Jul 2017 06:23:52 +0000 (14:23 +0800)
commit048009ea35c73f6cc95ebe308e58b20ebdc877d0
treeeb6eb6025e48431312d779afceac7340d5869bc2
parent81af47b7cf2de75c4392ba7edc371c3007c9ff91
parentcbf4c391c22a4f17e425771303279e3ff7d50ca5
Merge branch 'MDL-57791_master-fix5' of git://github.com/dmonllao/moodle