Merge branch 'MDL-61068-34' of git://github.com/andrewnicols/moodle into MOODLE_34_STABLE
commitca3605500e037107ac0d4f9f1ce3aa64373229c6
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 18:56:33 +0000 (8 19:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 18:56:33 +0000 (8 19:56 +0100)
tree1f122c3ea0994ba3052398fb240724cdd1f831e1
parent6beb56ba1fc129b5b4dc84d0c138dcb59cfe8f45
parentd0308d8d763032a19a0ee9c221220deeb831d783
Merge branch 'MDL-61068-34' of git://github.com/andrewnicols/moodle into MOODLE_34_STABLE