Merge branch 'MDL-38395' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 22:06:06 +0000 (23:06 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 22:06:06 +0000 (23:06 +0100)

Trivial merge