Merge branch 'MDL-41604-master-5' of git://github.com/mouneyrac/moodle
commit3ed255dc1a2f789fb05e005ad5d18fc910917ef6
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Oct 2013 23:33:21 +0000 (11 01:33 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Oct 2013 23:33:21 +0000 (11 01:33 +0200)
tree55f01273ada3bbcc698f7c4f163c86313ff9b4eb
parent4d4396c3b81151de19bdd3acd6988b9e1cc39fa0
parentb0ec47fb19a7cdda87145af1f0a643e0268ff489
Merge branch 'MDL-41604-master-5' of git://github.com/mouneyrac/moodle