Merge branch '47917-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
commit75387b8acb709b6b61e0ebf02dee8de559a50217
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Nov 2014 23:04:08 +0000 (4 00:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Nov 2014 23:04:08 +0000 (4 00:04 +0100)
treece215b9dc41cd8235241e1c44dede75b12efcc61
parent339c6eca3c881742178637cb41cc7ebbe4a3b6b0
parent56d37916d507a1d3865b691d5b9c6fd9ec1f0a2f
Merge branch '47917-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE