Merge branch 'MDL-38961_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 11 Apr 2013 14:32:32 +0000 (16:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 11 Apr 2013 14:32:32 +0000 (16:32 +0200)

Trivial merge