Merge branch 'moodle25-mdl33971' of https://github.com/tlock/moodle into MOODLE_25_STABLE
commite81cd4c37582e6b5610d9242f321c6a561c03701
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Dec 2013 16:18:26 +0000 (3 17:18 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Dec 2013 16:18:26 +0000 (3 17:18 +0100)
tree26e277489a4a4e528631e55a6460b051d996e475
parentb357a2a0837a013a0c3c1a1744f9db8a39a69aef
parent1df90c18135f934745c8dabcc999e0a8c35fd607
Merge branch 'moodle25-mdl33971' of https://github.com/tlock/moodle into MOODLE_25_STABLE