Merge branch 'MDL-38412' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 17:20:47 +0000 (18:20 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 17:20:47 +0000 (18:20 +0100)

Trivial merge