Merge branch 'MDL-38615_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 15:12:04 +0000 (17:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 15:12:04 +0000 (17:12 +0200)

Trivial merge