Merge branch 'MDL-52738-fixup' of https://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 20 Jan 2016 11:42:29 +0000 (11:42 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 20 Jan 2016 11:42:29 +0000 (11:42 +0000)
commit7fba3b03168489c86fc5af7ce2d0a20aea5a4615
tree7dc19cb9a7e8ac651a29d77a1e8fe1ee2d7f855f
parentd60bf9f1ddd8ca99b6b7459d9a19d26ecd6dd7a4
parent190fbfb60d2a13ac5688e81932e41955792007d3
Merge branch 'MDL-52738-fixup' of https://github.com/timhunt/moodle