Merge branch 'MDL-34931-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Oct 2012 11:32:44 +0000 (13:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Oct 2012 11:32:44 +0000 (13:32 +0200)

Trivial merge