Merge branch 'MDL-32134' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Apr 2012 22:07:23 +0000 (00:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Apr 2012 22:07:23 +0000 (00:07 +0200)

Trivial merge