Merge branch 'MDL-56346-master' of https://github.com/lucisgit/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Dec 2016 06:34:06 +0000 (14:34 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Dec 2016 06:34:06 +0000 (14:34 +0800)
commitafecb4dfd511b558e51fcbc3a27d1b6ce7a240e2
tree9d49a8074bbbd196017fb5132f8b418ae8c8bb61
parent7586a360226042a50ccf1a70625a4acc2c4945c5
parent7962b4845ccbacc7364b36ae6556731b67bd4691
Merge branch 'MDL-56346-master' of https://github.com/lucisgit/moodle