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

Trivial merge