Merge branch 'MDL-31101' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Jan 2012 22:34:56 +0000 (23:34 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Jan 2012 22:34:56 +0000 (23:34 +0100)
commit4cd2b394ac94d00babbc2f8982fd99088778babe
treefe2e08a2150e58eca50370cc4003e94e858670f2
parent246c2cb8e5af71a7d7c605b8fc9f9563e0fb3bc4
parentd07f7be8904549af48304dd54160e1eedc499cda
Merge branch 'MDL-31101' of git://github.com/timhunt/moodle