Merge branch 'MDL-49389' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Mar 2015 23:28:31 +0000 (00:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Mar 2015 23:28:31 +0000 (00:28 +0100)
commite201bf16a0165f4da5cf476671cb62c75722052c
tree7e49abc11f3073f1fbf472382b4e8795686ded3c
parent1f50bbf1849cfe6bac3d0d26ade9fb6febbbe205
parente1ace26f1114b859b84d2806c86a67f3f6eab79a
Merge branch 'MDL-49389' of git://github.com/timhunt/moodle