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

Trivial merge