Merge branch 'MDL-31153-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2012 23:57:25 +0000 (00:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2012 23:57:25 +0000 (00:57 +0100)

Trivial merge