Merge branch '38343-29' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Nov 2014 23:26:41 +0000 (00:26 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Nov 2014 23:26:41 +0000 (00:26 +0100)
commit27bfd2c4d14c7d3f71a39f1a63173d0a257f28db
tree54302a90f393feae23f588aada980198442a153e
parentf62b278a9127e3dbd6d89993dcae7506e2132923
parent51e7f0504335bacee074b0f872fcf20bf6fe6dc3
Merge branch '38343-29' of git://github.com/samhemelryk/moodle