Merge branch 'MDL-35134_master' of git://github.com/pauln/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Sep 2012 00:50:56 +0000 (02:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Sep 2012 00:50:56 +0000 (02:50 +0200)

Trivial merge