Merge branch 'MDL-34192' of git://github.com/stronk7/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2012 12:44:06 +0000 (14:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2012 12:44:06 +0000 (14:44 +0200)

Trivial merge