Merge branch 'MDL-31616' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jan 2013 19:14:03 +0000 (20:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jan 2013 19:14:03 +0000 (20:14 +0100)

Trivial merge