Merge branch 'MDL-33552' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Jun 2012 10:31:37 +0000 (12:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Jun 2012 10:31:37 +0000 (12:31 +0200)

Trivial merge