Merge branch 'MDL-61261-33' of git://github.com/sarjona/moodle into MOODLE_33_STABLE
commitdd6789815279a9e8e2760abe109ec64957c3dbbc
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Mar 2018 03:52:31 +0000 (12 11:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Mar 2018 03:52:31 +0000 (12 11:52 +0800)
tree9b927e60c1d10836c10b6a7c537af72339b144d6
parentf03765aae7888754f23634ed1955c14a8d7f4735
parent0c8d6093dcf17b5b6e8eba8b77ea3385bab37d51
Merge branch 'MDL-61261-33' of git://github.com/sarjona/moodle into MOODLE_33_STABLE