Merge branch 'MDL-36842' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Dec 2012 23:17:51 +0000 (00:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Dec 2012 23:17:51 +0000 (00:17 +0100)

Trivial merge