Merge branch 'wip-MDL-30540-master' of git://github.com/phalacee/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Feb 2012 00:17:51 +0000 (01:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Feb 2012 00:17:51 +0000 (01:17 +0100)

Trivial merge