Merge branch 'MDL-56273' of https://github.com/mr-russ/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Nov 2016 02:55:23 +0000 (10:55 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Nov 2016 02:55:23 +0000 (10:55 +0800)
commit326b285467c9608a1ddc576f0b001debf5b763e4
treed4b438ab63e1a366edca78ede51cec646836237b
parent0d80a4bd0b30c46b6c0bf7205bf9b77315107cab
parenta330e83ade87c15deaad96a2216c4fde6d7bc2bb
Merge branch 'MDL-56273' of https://github.com/mr-russ/moodle