Merge branch 'MDL-52781-master-fix' of https://github.com/lameze/moodle
commite1bb3cd3c291d5e0c92367a3e1042908f14062d1
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 22 Apr 2016 06:25:03 +0000 (22 14:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 22 Apr 2016 06:25:03 +0000 (22 14:25 +0800)
treeb523551b25c8ea699ef93943740a06e06e187227
parent284ac4240f8649f2feb1565fba06c0f68d40fe07
parent7c2bdca2f679238ef19f25bda88dd21c1b8c75f9
Merge branch 'MDL-52781-master-fix' of https://github.com/lameze/moodle