Merge branch 'MDL-43743_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jan 2014 23:05:03 +0000 (00:05 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jan 2014 23:05:03 +0000 (00:05 +0100)

Trivial merge