Merge branch 'MDL-30851_master_wip' of git://github.com/grabs/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jan 2012 19:23:11 +0000 (20:23 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jan 2012 19:23:11 +0000 (20:23 +0100)

Trivial merge