Merge branch 'MDL-30777_t2' of git://github.com/kiklop74/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Dec 2011 23:38:48 +0000 (00:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Dec 2011 23:38:48 +0000 (00:38 +0100)

Trivial merge