Merge branch 'MDL-38076-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Feb 2013 09:14:28 +0000 (10:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Feb 2013 09:14:28 +0000 (10:14 +0100)

Trivial merge