Merge branch 'MDL-55586-master' of https://github.com/StudiUM/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Sep 2016 00:17:37 +0000 (08:17 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Sep 2016 00:17:37 +0000 (08:17 +0800)
commit13c879260639114ffb8af91a27686ff6bb4b199b
treeffc435057af930808987917fa632a97061b0ef2a
parent0f4b338fbb39f94900f47e6e4210cef22ec1199d
parent0d12feb6c841001b19cf3886aa019a199186e202
Merge branch 'MDL-55586-master' of https://github.com/StudiUM/moodle