Merge branch 'MDL-37485' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jan 2013 22:21:38 +0000 (23:21 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jan 2013 22:21:38 +0000 (23:21 +0100)

Trivial merge