Merge branch 'MDL-30031' of git://github.com/bostelm/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jan 2012 01:14:20 +0000 (02:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jan 2012 01:14:20 +0000 (02:14 +0100)

Trivial merge