Merge branch 'MDL-29506-30' of git://github.com/andrewnicols/moodle into MOODLE_30_STABLE
commit5dc2d2eb4ec729e103c7ed07b98dadefabfb36bb
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Feb 2016 16:50:31 +0000 (16 17:50 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Feb 2016 16:50:31 +0000 (16 17:50 +0100)
treecd5557d710f802f4b65f728bfd04ddfd202f3d7f
parent3bb2f388bbebcf93876a2470e693daf4ddefb477
parentc063da3610a14a660ee047d36ebcd9bab61a731a
Merge branch 'MDL-29506-30' of git://github.com/andrewnicols/moodle into MOODLE_30_STABLE