Merge branch 'MDL-30739' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Dec 2011 01:21:00 +0000 (02:21 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Dec 2011 01:21:00 +0000 (02:21 +0100)

Trivial merge