Merge branch 'MDL-39617-master' of https://github.com/lucisgit/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 3 Feb 2014 19:41:37 +0000 (08:41 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 3 Feb 2014 19:41:37 +0000 (08:41 +1300)
commit6bdf77c1913cf1b10cee7cbb05f7e75108e40b62
treea8b59d577cd2a100fbddc8642b11b9db18668d8b
parent6958c718cc9ba90172d366d68f591cd9b6c799ad
parentd00951b585bd82f9bdfb83fd0613bc41bc3f24dc
Merge branch 'MDL-39617-master' of https://github.com/lucisgit/moodle