Merge branch 'MDL-37555' of git://github.com/stronk7/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Jan 2013 19:52:47 +0000 (20:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Jan 2013 19:52:47 +0000 (20:52 +0100)

Trivial merge