Merge branch 'MDL-43423_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jan 2014 01:02:29 +0000 (02:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jan 2014 01:02:29 +0000 (02:02 +0100)

Trivial merge