Merge branch 'MDL-37847' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Feb 2013 21:54:50 +0000 (22:54 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Feb 2013 21:54:50 +0000 (22:54 +0100)

Trivial merge