Merge branch 'MDL-47031-master-enfix' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Sep 2014 17:25:38 +0000 (19:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Sep 2014 17:25:38 +0000 (19:25 +0200)
commit419119173556bf459361f504adab97297e05b3bd
treea1a4e636c3a7b2c920794eca1d841c81ba0f8917
parent1f20801c354158523dc22ec56a932fe8c9f33b3c
parent9447cdc20643a1b7ead3f1bbea080b9661f42f86
Merge branch 'MDL-47031-master-enfix' of git://github.com/mudrd8mz/moodle