Merge branch 'MDL-30700-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Dec 2012 18:56:31 +0000 (19:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Dec 2012 18:56:31 +0000 (19:56 +0100)

Trivial merge