Merge branch 'MDL-54613-m' of https://github.com/micaherne/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 19 May 2016 03:20:58 +0000 (11:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 19 May 2016 03:20:58 +0000 (11:20 +0800)
commit89fc74508bcec20d44635cf46e0891e1cec8b17a
tree954e3597035a3ef40414ee46d920b0be07df98b1
parenta88f8b2fd560dff9af4f152230dbd5cb72ec6d47
parent0c0f01aa4c4b2afcb3c8b9d811dd162e05943862
Merge branch 'MDL-54613-m' of https://github.com/micaherne/moodle