Merge branch 'MDL-56952-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Nov 2016 02:18:01 +0000 (10:18 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Nov 2016 09:07:37 +0000 (09:07 +0000)
commit7afc76fbd6bbac94cbf2fedebdd34d1f1522c046
treed270b5522ce1164dfe9e262bab38a5c11a19ad5f
parent2d45ac279dfb7405d414829ca74f70a29feacc88
parent204413187ea8a0a1349594180e7d1ee01ab46621
Merge branch 'MDL-56952-master' of git://github.com/damyon/moodle