Merge branch 'MDL-51413-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Sep 2015 04:22:55 +0000 (12:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Sep 2015 04:22:55 +0000 (12:22 +0800)
commita32cd742c3efcc7a87fa70f12a56d0ddb127dd4f
tree5190fc5bfb121ebf0843a9f9cabda9832a548f11
parenteed34b118a8cc88d03341356c0ac438bfbfa5fe7
parentea5b910b3a8cf07d31594baba203bb8af296505e
Merge branch 'MDL-51413-master' of git://github.com/jleyva/moodle