Merge branch 'MDL-30203-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 00:44:49 +0000 (01:44 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 00:44:49 +0000 (01:44 +0100)

Trivial merge