Merge branch 'MDL-36570' of git://github.com/colchambers/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 4 Apr 2013 14:59:34 +0000 (16:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 4 Apr 2013 14:59:34 +0000 (16:59 +0200)

Trivial merge