Merge branch 'MDL-56282-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Oct 2016 04:18:22 +0000 (12:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Oct 2016 04:18:22 +0000 (12:18 +0800)
commit4e5d96ee3ac569f5be801775a1fe4478961ee329
tree3dba59b42f64a2779e290ff78ab436f5e7e231b0
parentc86fb2178991e2387e0e33b34bb96d76da145b5e
parent77bec234e0de7237fd8f9ee73e5438803716f7c6
Merge branch 'MDL-56282-master' of git://github.com/damyon/moodle