Merge branch 'm29_MDL-48532' of https://github.com/totara/moodle
commitcccab734519c4f7e08fb8810e01c3ee61ec295ff
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Dec 2014 14:47:06 +0000 (16 15:47 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Dec 2014 14:47:06 +0000 (16 15:47 +0100)
tree27f85f104cec6ba025b3727353d780585c71cfb7
parentb721d502e475c99ebe007b15ffd018b47f431f22
parentae00e55a0053af58083b9d99cf5dce1624cf674b
Merge branch 'm29_MDL-48532' of https://github.com/totara/moodle