Merge branch 'MDL-56698-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Nov 2016 07:34:06 +0000 (15:34 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Nov 2016 07:34:06 +0000 (15:34 +0800)
commit0c6fa2e9a885a99507487978e7d99eb9dd7fa7c1
treea089c84d55c10f2ffbba8b75beedc16c2752579f
parent1d9356d7e92cd40800af732db6c8ba0e7761addb
parenta5d4b54890f06991349faa248026444cdc68dd92
Merge branch 'MDL-56698-master' of git://github.com/damyon/moodle