Merge branch 'MDL-35744' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2012 22:40:10 +0000 (00:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2012 22:40:10 +0000 (00:40 +0200)
commitb478f2ec1085de0e9beb7eb9d41794e3af75af59
treed63b1266f7671ede162ba290c9fe5f30ffba544c
parent40b26758db2ef1e3cb09eb733b4d1780bc7ad9fc
parentb3c18b862149c1f6306968c5ea80db85c9a2eda1
Merge branch 'MDL-35744' of git://github.com/timhunt/moodle