Merge branch 'MDL-33359' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 28 May 2012 19:25:01 +0000 (21:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 28 May 2012 19:25:01 +0000 (21:25 +0200)

Trivial merge