Merge branch 'MDL-52821-master-fix' of github.com:xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 16 Mar 2016 04:23:41 +0000 (12:23 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 16 Mar 2016 04:23:41 +0000 (12:23 +0800)
commit0758e02e84e66c3fe4c50f87ba9ca06b1426472b
tree5fa20cc6982fd0b2006fa293180a5d2e6972d05c
parent0aa3fedb237bbe230fee6b9d852f88c3564ca163
parent2a5bb939c20bcb3e333edab1a1f4409bb255eb7a
Merge branch 'MDL-52821-master-fix' of github.com:xow/moodle