Merge branch 'MDL-33507' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Jun 2012 19:47:14 +0000 (21:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Jun 2012 19:47:14 +0000 (21:47 +0200)

Trivial merge