Merge branch '47752-28' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 15:31:24 +0000 (16:31 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:16 +0000 (11:48 +0200)
commit0ca7a4b75bdbb74073c71e5486ea04fe4a2914ad
treed68c5350a1227dd30f557124e8d4975c5c20c300
parent3456ac3ba0692926f86c0c2c7a1a58c49ca35bb1
parented7605f481d9d819d571306a8994734451d48e6c
Merge branch '47752-28' of git://github.com/samhemelryk/moodle