Merge branch 'MDL-8307-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Sep 2012 09:33:24 +0000 (11:33 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Sep 2012 09:33:24 +0000 (11:33 +0200)

Trivial merge