Merge branch 'wip-MDL-30991-master' of git://github.com/phalacee/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Mar 2012 20:41:36 +0000 (21:41 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Mar 2012 20:41:36 +0000 (21:41 +0100)

Trivial merge