Merge branch 'MDL-30783_t2' of git://github.com/kiklop74/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jan 2012 20:47:16 +0000 (21:47 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jan 2012 20:47:16 +0000 (21:47 +0100)

Trivial merge