Merge branch 'MDL-34756-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Aug 2012 14:34:18 +0000 (16:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Aug 2012 14:34:18 +0000 (16:34 +0200)

Trivial merge