Merge branch 'MDL-15187-master' of git://github.com/andrewnicols/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Apr 2015 00:33:11 +0000 (08:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Apr 2015 00:33:11 +0000 (08:33 +0800)
commit78a57b259a678bd753f742a22975c62025e0e34a
treed472dc902fa5f59b9a33379325a20d7133233b70
parentfa48383bfa8e983eb808f8ce9bd8d2c06305c358
parent2a34360ed99d1db49bbea7ce04f9bc3df160da6b
Merge branch 'MDL-15187-master' of git://github.com/andrewnicols/moodle