Merge branch 'MDL-30300' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 23:00:12 +0000 (00:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 23:00:12 +0000 (00:00 +0100)
commit69f9e7f3e48102052b3024da68075033ba88e493
tree1c9c609ed76bb0274dff95acb5dd5f6937779677
parent7a25d39873fefe768f795a9a29b46d0ff74b79d4
parent3d17cd3f1ca118ac681074252485aee7ad70b1d8
Merge branch 'MDL-30300' of git://github.com/timhunt/moodle