Merge branch 'MDL-38849' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Apr 2013 22:52:27 +0000 (00:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Apr 2013 22:52:27 +0000 (00:52 +0200)

Trivial merge