Merge branch 'MDL-33326' of git://github.com/stronk7/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 31 May 2012 22:58:08 +0000 (00:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 31 May 2012 22:58:08 +0000 (00:58 +0200)

Trivial merge