Merge branch 'MDL-53349-32' of https://github.com/xow/moodle into MOODLE_32_STABLE
commit09261027b6e7ec5b810008772d19d164080d89c4
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Feb 2017 15:09:46 +0000 (6 16:09 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Feb 2017 15:09:46 +0000 (6 16:09 +0100)
tree714a646fb67c50ccf47fb1d98ed6a5faa3dbd235
parente0c4e6496fed82047cc7f8dc93b42ea579afb816
parentec319d13dfeb69572fc7ddf94a4730881f0e021a
Merge branch 'MDL-53349-32' of https://github.com/xow/moodle into MOODLE_32_STABLE