Merge branch 'MDL-31015-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2012 18:44:21 +0000 (19:44 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2012 18:44:21 +0000 (19:44 +0100)

Trivial merge