Merge branch 'MDL-51529-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 13:30:18 +0000 (14:30 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:32:38 +0000 (16:32 +0100)
commit67f2463f34de8e30b4560a4e4076d2a57d2f23bf
treef68cfcdcea9e0c26b89f52c594df6ad72d7754eb
parenta6c6294091d763c3e609a31b580864543865c655
parentbd738ddf5fc2281b8172aacec7feaba76749f13d
Merge branch 'MDL-51529-master' of git://github.com/damyon/moodle