Merge branch 'MDL-37943' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Feb 2013 00:20:56 +0000 (01:20 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Feb 2013 00:20:56 +0000 (01:20 +0100)

Trivial merge