Merge branch 'MDL-33426-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jul 2012 14:08:03 +0000 (16:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jul 2012 14:08:03 +0000 (16:08 +0200)

Trivial merge