Merge branch 'MDL-32107-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Jun 2012 22:42:59 +0000 (00:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Jun 2012 22:42:59 +0000 (00:42 +0200)

Trivial merge