Merge branch 'MDL-37982_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 23:01:47 +0000 (00:01 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 23:01:47 +0000 (00:01 +0100)

Trivial merge